From e8c41768cbdec5a0b8a978d45132cbfd6e20c843 Mon Sep 17 00:00:00 2001
From: wanghe <wanghe@fit2cloud.com>
Date: Tue, 12 Mar 2024 10:36:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=20Apache=20Tomcat=20?=
 =?UTF-8?q?(#1069)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/tomcat/10.1.19/data.yml           |  17 +++++++++++++++++
 apps/tomcat/10.1.19/data/.gitkeep      |   0
 apps/tomcat/10.1.19/docker-compose.yml |  19 +++++++++++++++++++
 apps/tomcat/10.1.19/scripts/init.sh    |   3 +++
 apps/tomcat/8.5.99/data.yml            |  17 +++++++++++++++++
 apps/tomcat/8.5.99/data/.gitkeep       |   0
 apps/tomcat/8.5.99/docker-compose.yml  |  19 +++++++++++++++++++
 apps/tomcat/8.5.99/scripts/init.sh     |   3 +++
 apps/tomcat/9.0.86/data.yml            |  17 +++++++++++++++++
 apps/tomcat/9.0.86/data/.gitkeep       |   0
 apps/tomcat/9.0.86/docker-compose.yml  |  19 +++++++++++++++++++
 apps/tomcat/9.0.86/scripts/init.sh     |   3 +++
 apps/tomcat/README.md                  |  14 ++++++++++++++
 apps/tomcat/data.yml                   |  20 ++++++++++++++++++++
 apps/tomcat/logo.png                   | Bin 0 -> 2824 bytes
 renovate.json                          |  12 ++++++++++++
 16 files changed, 163 insertions(+)
 create mode 100755 apps/tomcat/10.1.19/data.yml
 create mode 100644 apps/tomcat/10.1.19/data/.gitkeep
 create mode 100644 apps/tomcat/10.1.19/docker-compose.yml
 create mode 100644 apps/tomcat/10.1.19/scripts/init.sh
 create mode 100755 apps/tomcat/8.5.99/data.yml
 create mode 100644 apps/tomcat/8.5.99/data/.gitkeep
 create mode 100644 apps/tomcat/8.5.99/docker-compose.yml
 create mode 100644 apps/tomcat/8.5.99/scripts/init.sh
 create mode 100755 apps/tomcat/9.0.86/data.yml
 create mode 100644 apps/tomcat/9.0.86/data/.gitkeep
 create mode 100644 apps/tomcat/9.0.86/docker-compose.yml
 create mode 100644 apps/tomcat/9.0.86/scripts/init.sh
 create mode 100644 apps/tomcat/README.md
 create mode 100755 apps/tomcat/data.yml
 create mode 100644 apps/tomcat/logo.png

diff --git a/apps/tomcat/10.1.19/data.yml b/apps/tomcat/10.1.19/data.yml
new file mode 100755
index 000000000..871db38f5
--- /dev/null
+++ b/apps/tomcat/10.1.19/data.yml
@@ -0,0 +1,17 @@
+additionalProperties:
+  formFields:
+    - default: 8080
+      envKey: PANEL_APP_PORT_HTTP
+      labelEn: Port
+      labelZh: 端口
+      required: true
+      rule: paramPort
+      type: number
+    - default: tomcat
+      envKey: TOMCAT_PASSWORD
+      labelEn: Tomcat Password
+      labelZh: 管理员密码
+      random: true
+      required: true
+      rule: paramComplexity
+      type: password
diff --git a/apps/tomcat/10.1.19/data/.gitkeep b/apps/tomcat/10.1.19/data/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/tomcat/10.1.19/docker-compose.yml b/apps/tomcat/10.1.19/docker-compose.yml
new file mode 100644
index 000000000..d14f82fe0
--- /dev/null
+++ b/apps/tomcat/10.1.19/docker-compose.yml
@@ -0,0 +1,19 @@
+version: '3'
+services:
+  nexus:
+    image: bitnami/tomcat:10.1.19
+    restart: always
+    container_name: ${CONTAINER_NAME}
+    environment:
+      - TOMCAT_PASSWORD=${TOMCAT_PASSWORD}
+    ports:
+      - ${PANEL_APP_PORT_HTTP}:8080
+    volumes:
+      - ./data:/bitnami/tomcat
+    networks:
+      - 1panel-network
+    labels:
+      createdBy: "Apps"
+networks:
+  1panel-network:
+    external: true
\ No newline at end of file
diff --git a/apps/tomcat/10.1.19/scripts/init.sh b/apps/tomcat/10.1.19/scripts/init.sh
new file mode 100644
index 000000000..5fa267326
--- /dev/null
+++ b/apps/tomcat/10.1.19/scripts/init.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+chown -R 1001:1001 data
\ No newline at end of file
diff --git a/apps/tomcat/8.5.99/data.yml b/apps/tomcat/8.5.99/data.yml
new file mode 100755
index 000000000..871db38f5
--- /dev/null
+++ b/apps/tomcat/8.5.99/data.yml
@@ -0,0 +1,17 @@
+additionalProperties:
+  formFields:
+    - default: 8080
+      envKey: PANEL_APP_PORT_HTTP
+      labelEn: Port
+      labelZh: 端口
+      required: true
+      rule: paramPort
+      type: number
+    - default: tomcat
+      envKey: TOMCAT_PASSWORD
+      labelEn: Tomcat Password
+      labelZh: 管理员密码
+      random: true
+      required: true
+      rule: paramComplexity
+      type: password
diff --git a/apps/tomcat/8.5.99/data/.gitkeep b/apps/tomcat/8.5.99/data/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/tomcat/8.5.99/docker-compose.yml b/apps/tomcat/8.5.99/docker-compose.yml
new file mode 100644
index 000000000..f82cd6f57
--- /dev/null
+++ b/apps/tomcat/8.5.99/docker-compose.yml
@@ -0,0 +1,19 @@
+version: '3'
+services:
+  nexus:
+    image: bitnami/tomcat:8.5.99
+    restart: always
+    container_name: ${CONTAINER_NAME}
+    environment:
+      - TOMCAT_PASSWORD=${TOMCAT_PASSWORD}
+    ports:
+      - ${PANEL_APP_PORT_HTTP}:8080
+    volumes:
+      - ./data:/bitnami/tomcat
+    networks:
+      - 1panel-network
+    labels:
+      createdBy: "Apps"
+networks:
+  1panel-network:
+    external: true
\ No newline at end of file
diff --git a/apps/tomcat/8.5.99/scripts/init.sh b/apps/tomcat/8.5.99/scripts/init.sh
new file mode 100644
index 000000000..5fa267326
--- /dev/null
+++ b/apps/tomcat/8.5.99/scripts/init.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+chown -R 1001:1001 data
\ No newline at end of file
diff --git a/apps/tomcat/9.0.86/data.yml b/apps/tomcat/9.0.86/data.yml
new file mode 100755
index 000000000..871db38f5
--- /dev/null
+++ b/apps/tomcat/9.0.86/data.yml
@@ -0,0 +1,17 @@
+additionalProperties:
+  formFields:
+    - default: 8080
+      envKey: PANEL_APP_PORT_HTTP
+      labelEn: Port
+      labelZh: 端口
+      required: true
+      rule: paramPort
+      type: number
+    - default: tomcat
+      envKey: TOMCAT_PASSWORD
+      labelEn: Tomcat Password
+      labelZh: 管理员密码
+      random: true
+      required: true
+      rule: paramComplexity
+      type: password
diff --git a/apps/tomcat/9.0.86/data/.gitkeep b/apps/tomcat/9.0.86/data/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/tomcat/9.0.86/docker-compose.yml b/apps/tomcat/9.0.86/docker-compose.yml
new file mode 100644
index 000000000..c8bc2a6eb
--- /dev/null
+++ b/apps/tomcat/9.0.86/docker-compose.yml
@@ -0,0 +1,19 @@
+version: '3'
+services:
+  nexus:
+    image: bitnami/tomcat:9.0.86
+    restart: always
+    container_name: ${CONTAINER_NAME}
+    environment:
+      - TOMCAT_PASSWORD=${TOMCAT_PASSWORD}
+    ports:
+      - ${PANEL_APP_PORT_HTTP}:8080
+    volumes:
+      - ./data:/bitnami/tomcat
+    networks:
+      - 1panel-network
+    labels:
+      createdBy: "Apps"
+networks:
+  1panel-network:
+    external: true
\ No newline at end of file
diff --git a/apps/tomcat/9.0.86/scripts/init.sh b/apps/tomcat/9.0.86/scripts/init.sh
new file mode 100644
index 000000000..5fa267326
--- /dev/null
+++ b/apps/tomcat/9.0.86/scripts/init.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+chown -R 1001:1001 data
\ No newline at end of file
diff --git a/apps/tomcat/README.md b/apps/tomcat/README.md
new file mode 100644
index 000000000..0f2a96767
--- /dev/null
+++ b/apps/tomcat/README.md
@@ -0,0 +1,14 @@
+# 使用说明
+
+- 管理员用户名：manager
+- 镜像采用的是 Java 17 版本。
+
+# Apache Tomcat
+
+Apache Tomcat® 软件是 Java Servlet、JavaServer Pages、Java Expression Language 和 Java WebSocket 技术的开源实现。Java Servlet、JavaServer Pages、Java Expression Language 和 Java WebSocket 规范是在 [Java 社区进程](https://jcp.org/en/introduction/overview) 下开发的。
+
+Apache Tomcat 软件是在开放和参与式环境中开发的，并在 [Apache 许可证版本 2](](https://www.apache.org/licenses/)) 下发布。Apache Tomcat 项目旨在成为来自世界各地的最优秀开发者的合作。我们邀请您参与这个开放的开发项目。要了解更多信息，[点击这里](https://tomcat.apache.org/getinvolved.html) 或继续阅读。
+
+Apache Tomcat 软件驱动着许多大型、关键性的网络应用程序，涵盖了各种行业和组织。其中一些用户及其故事列在 [PoweredBy wiki 页面](https://cwiki.apache.org/confluence/display/TOMCAT/PoweredBy)上。
+
+Apache Tomcat、Tomcat、Apache、Apache feather和 Apache Tomcat 项目标志是 Apache 软件基金会的商标。
\ No newline at end of file
diff --git a/apps/tomcat/data.yml b/apps/tomcat/data.yml
new file mode 100755
index 000000000..aca129b83
--- /dev/null
+++ b/apps/tomcat/data.yml
@@ -0,0 +1,20 @@
+name: Apache Tomcat 
+tags:
+    - 开发工具
+title: 开源的 Web 服务器和 Servlet 容器
+type: 开发工具
+description: 开源的 Web 服务器和 Servlet 容器
+additionalProperties:
+    key: tomcat
+    name: Apache Tomcat 
+    tags:
+        - DevTool
+    shortDescZh: 开源的 Web 服务器和 Servlet 容器
+    shortDescEn: An open-source web server and servlet container
+    type: tool
+    crossVersionUpdate: false
+    limit: 0
+    recommend: 0
+    website: https://tomcat.apache.org/
+    github: https://github.com/apache/tomcat
+    document: https://tomcat.apache.org/
diff --git a/apps/tomcat/logo.png b/apps/tomcat/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..d461866268c9640c1944f18e2373178ececd0d03
GIT binary patch
literal 2824
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
Y)q0LQH7p|O`rpvCFtssxV&ob3A5~X4xc~qF

literal 0
HcmV?d00001

diff --git a/renovate.json b/renovate.json
index fa302d152..8893fc847 100644
--- a/renovate.json
+++ b/renovate.json
@@ -49,6 +49,18 @@
     {
       "matchFileNames": ["apps/dataease/2.*/*.yml"],
       "allowedVersions": ">=2.0"
+    },
+    {
+      "matchFileNames": ["apps/tomcat/8.*/*.yml"],
+      "allowedVersions": "/^8.*/"
+    },
+    {
+      "matchFileNames": ["apps/tomcat/9.*/*.yml"],
+      "allowedVersions": "/^9.*/"
+    },
+    {
+      "matchFileNames": ["apps/tomcat/10.*/*.yml"],
+      "allowedVersions": "/^10.*/"
     }
   ],
   "prCreation": "immediate"