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 00000000..871db38f
--- /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 00000000..e69de29b
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 00000000..d14f82fe
--- /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 00000000..5fa26732
--- /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 00000000..871db38f
--- /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 00000000..e69de29b
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 00000000..f82cd6f5
--- /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 00000000..5fa26732
--- /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 00000000..871db38f
--- /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 00000000..e69de29b
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 00000000..c8bc2a6e
--- /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 00000000..5fa26732
--- /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 00000000..0f2a9676
--- /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 00000000..aca129b8
--- /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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
aFXw+Uyhtg?79Lyx0000<MNUMnLSTYbS2(!<

literal 0
KcmV+b0RR6000031

diff --git a/renovate.json b/renovate.json
index fa302d15..8893fc84 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"