From ef348e9d58b260355c0d6732d1eeb2ceab7c198c Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Tue, 29 Apr 2025 03:37:42 +0000 Subject: [PATCH] Synced apps from source repository via GitHub Actions --- apps/ammds/{1.4.13 => 1.5.1}/.env | 0 apps/ammds/{1.4.13 => 1.5.1}/data.yml | 0 .../{1.4.13 => 1.5.1}/docker-compose.yml | 2 +- apps/ammds/{1.4.13 => 1.5.1}/envs/default.env | 0 apps/ammds/{1.4.13 => 1.5.1}/envs/global.env | 0 apps/ammds/{1.4.13 => 1.5.1}/scripts/init.sh | 0 .../{1.4.13 => 1.5.1}/scripts/uninstall.sh | 0 .../{1.4.13 => 1.5.1}/scripts/upgrade.sh | 0 apps/beszel-agent/{0.11.0 => 0.11.1}/.env | 0 apps/beszel-agent/{0.11.0 => 0.11.1}/data.yml | 0 .../{0.11.0 => 0.11.1}/docker-compose.yml | 2 +- .../{0.11.0 => 0.11.1}/envs/default.env | 0 .../{0.11.0 => 0.11.1}/envs/global.env | 0 .../{0.11.0 => 0.11.1}/scripts/init.sh | 0 .../{0.11.0 => 0.11.1}/scripts/uninstall.sh | 0 .../{0.11.0 => 0.11.1}/scripts/upgrade.sh | 0 apps/beszel/{0.11.0 => 0.11.1}/.env | 0 apps/beszel/{0.11.0 => 0.11.1}/data.yml | 0 .../{0.11.0 => 0.11.1}/docker-compose.yml | 2 +- .../{0.11.0 => 0.11.1}/envs/default.env | 0 .../beszel/{0.11.0 => 0.11.1}/envs/global.env | 0 .../beszel/{0.11.0 => 0.11.1}/scripts/init.sh | 0 .../{0.11.0 => 0.11.1}/scripts/uninstall.sh | 0 .../{0.11.0 => 0.11.1}/scripts/upgrade.sh | 0 apps/logto/{1.26.0 => 1.27.0}/.env | 0 apps/logto/{1.26.0 => 1.27.0}/data.yml | 0 .../{1.26.0 => 1.27.0}/docker-compose.yml | 2 +- .../logto/{1.26.0 => 1.27.0}/envs/default.env | 0 apps/logto/{1.26.0 => 1.27.0}/envs/global.env | 0 apps/logto/{1.26.0 => 1.27.0}/scripts/init.sh | 0 .../{1.26.0 => 1.27.0}/scripts/uninstall.sh | 0 .../{1.26.0 => 1.27.0}/scripts/upgrade.sh | 0 apps/n8n/{1.90.2 => 1.91.0}/.env | 0 apps/n8n/{1.90.2 => 1.91.0}/data.yml | 0 .../n8n/{1.90.2 => 1.91.0}/docker-compose.yml | 2 +- apps/n8n/{1.90.2 => 1.91.0}/envs/default.env | 0 apps/n8n/{1.90.2 => 1.91.0}/envs/global.env | 0 apps/n8n/{1.90.2 => 1.91.0}/scripts/init.sh | 0 .../{1.90.2 => 1.91.0}/scripts/uninstall.sh | 0 .../n8n/{1.90.2 => 1.91.0}/scripts/upgrade.sh | 0 apps/nacos/2.5.1/.env | 66 +++++ apps/nacos/2.5.1/data.yml | 185 ++++++++++++++ apps/nacos/2.5.1/docker-compose.yml | 26 ++ .../5.11.1.0 => nacos/2.5.1}/envs/default.env | 0 .../5.11.1.0 => nacos/2.5.1}/envs/global.env | 0 apps/nacos/2.5.1/init/mysql-schema.sql | 227 ++++++++++++++++++ apps/nacos/2.5.1/scripts/init.sh | 26 ++ .../2.5.1}/scripts/uninstall.sh | 0 apps/nacos/2.5.1/scripts/upgrade.sh | 17 ++ apps/nacos/3.0.0/.env | 15 +- apps/nacos/3.0.0/data.yml | 38 +-- apps/nacos/3.0.0/docker-compose.yml | 11 +- apps/nacos/3.0.0/init/mysql-schema.sql | 43 ---- apps/nacos/README.md | 2 + apps/weblate/{5.11.1.0 => 5.11.1.1}/.env | 0 apps/weblate/{5.11.1.0 => 5.11.1.1}/data.yml | 0 .../{5.11.1.0 => 5.11.1.1}/docker-compose.yml | 2 +- apps/weblate/5.11.1.1/envs/default.env | 2 + apps/weblate/5.11.1.1/envs/global.env | 2 + .../{5.11.1.0 => 5.11.1.1}/scripts/init.sh | 0 apps/weblate/5.11.1.1/scripts/uninstall.sh | 10 + .../{5.11.1.0 => 5.11.1.1}/scripts/upgrade.sh | 0 62 files changed, 592 insertions(+), 90 deletions(-) rename apps/ammds/{1.4.13 => 1.5.1}/.env (100%) rename apps/ammds/{1.4.13 => 1.5.1}/data.yml (100%) rename apps/ammds/{1.4.13 => 1.5.1}/docker-compose.yml (95%) rename apps/ammds/{1.4.13 => 1.5.1}/envs/default.env (100%) rename apps/ammds/{1.4.13 => 1.5.1}/envs/global.env (100%) rename apps/ammds/{1.4.13 => 1.5.1}/scripts/init.sh (100%) rename apps/ammds/{1.4.13 => 1.5.1}/scripts/uninstall.sh (100%) rename apps/ammds/{1.4.13 => 1.5.1}/scripts/upgrade.sh (100%) rename apps/beszel-agent/{0.11.0 => 0.11.1}/.env (100%) rename apps/beszel-agent/{0.11.0 => 0.11.1}/data.yml (100%) rename apps/beszel-agent/{0.11.0 => 0.11.1}/docker-compose.yml (92%) rename apps/beszel-agent/{0.11.0 => 0.11.1}/envs/default.env (100%) rename apps/beszel-agent/{0.11.0 => 0.11.1}/envs/global.env (100%) rename apps/beszel-agent/{0.11.0 => 0.11.1}/scripts/init.sh (100%) rename apps/beszel-agent/{0.11.0 => 0.11.1}/scripts/uninstall.sh (100%) rename apps/beszel-agent/{0.11.0 => 0.11.1}/scripts/upgrade.sh (100%) rename apps/beszel/{0.11.0 => 0.11.1}/.env (100%) rename apps/beszel/{0.11.0 => 0.11.1}/data.yml (100%) rename apps/beszel/{0.11.0 => 0.11.1}/docker-compose.yml (91%) rename apps/beszel/{0.11.0 => 0.11.1}/envs/default.env (100%) rename apps/beszel/{0.11.0 => 0.11.1}/envs/global.env (100%) rename apps/beszel/{0.11.0 => 0.11.1}/scripts/init.sh (100%) rename apps/beszel/{0.11.0 => 0.11.1}/scripts/uninstall.sh (100%) rename apps/beszel/{0.11.0 => 0.11.1}/scripts/upgrade.sh (100%) rename apps/logto/{1.26.0 => 1.27.0}/.env (100%) rename apps/logto/{1.26.0 => 1.27.0}/data.yml (100%) rename apps/logto/{1.26.0 => 1.27.0}/docker-compose.yml (95%) rename apps/logto/{1.26.0 => 1.27.0}/envs/default.env (100%) rename apps/logto/{1.26.0 => 1.27.0}/envs/global.env (100%) rename apps/logto/{1.26.0 => 1.27.0}/scripts/init.sh (100%) rename apps/logto/{1.26.0 => 1.27.0}/scripts/uninstall.sh (100%) rename apps/logto/{1.26.0 => 1.27.0}/scripts/upgrade.sh (100%) rename apps/n8n/{1.90.2 => 1.91.0}/.env (100%) rename apps/n8n/{1.90.2 => 1.91.0}/data.yml (100%) rename apps/n8n/{1.90.2 => 1.91.0}/docker-compose.yml (94%) rename apps/n8n/{1.90.2 => 1.91.0}/envs/default.env (100%) rename apps/n8n/{1.90.2 => 1.91.0}/envs/global.env (100%) rename apps/n8n/{1.90.2 => 1.91.0}/scripts/init.sh (100%) rename apps/n8n/{1.90.2 => 1.91.0}/scripts/uninstall.sh (100%) rename apps/n8n/{1.90.2 => 1.91.0}/scripts/upgrade.sh (100%) create mode 100644 apps/nacos/2.5.1/.env create mode 100644 apps/nacos/2.5.1/data.yml create mode 100644 apps/nacos/2.5.1/docker-compose.yml rename apps/{weblate/5.11.1.0 => nacos/2.5.1}/envs/default.env (100%) rename apps/{weblate/5.11.1.0 => nacos/2.5.1}/envs/global.env (100%) create mode 100644 apps/nacos/2.5.1/init/mysql-schema.sql create mode 100644 apps/nacos/2.5.1/scripts/init.sh rename apps/{weblate/5.11.1.0 => nacos/2.5.1}/scripts/uninstall.sh (100%) create mode 100644 apps/nacos/2.5.1/scripts/upgrade.sh rename apps/weblate/{5.11.1.0 => 5.11.1.1}/.env (100%) rename apps/weblate/{5.11.1.0 => 5.11.1.1}/data.yml (100%) rename apps/weblate/{5.11.1.0 => 5.11.1.1}/docker-compose.yml (94%) create mode 100644 apps/weblate/5.11.1.1/envs/default.env create mode 100644 apps/weblate/5.11.1.1/envs/global.env rename apps/weblate/{5.11.1.0 => 5.11.1.1}/scripts/init.sh (100%) create mode 100644 apps/weblate/5.11.1.1/scripts/uninstall.sh rename apps/weblate/{5.11.1.0 => 5.11.1.1}/scripts/upgrade.sh (100%) diff --git a/apps/ammds/1.4.13/.env b/apps/ammds/1.5.1/.env similarity index 100% rename from apps/ammds/1.4.13/.env rename to apps/ammds/1.5.1/.env diff --git a/apps/ammds/1.4.13/data.yml b/apps/ammds/1.5.1/data.yml similarity index 100% rename from apps/ammds/1.4.13/data.yml rename to apps/ammds/1.5.1/data.yml diff --git a/apps/ammds/1.4.13/docker-compose.yml b/apps/ammds/1.5.1/docker-compose.yml similarity index 95% rename from apps/ammds/1.4.13/docker-compose.yml rename to apps/ammds/1.5.1/docker-compose.yml index 63599bd..3f1bf92 100644 --- a/apps/ammds/1.4.13/docker-compose.yml +++ b/apps/ammds/1.5.1/docker-compose.yml @@ -11,7 +11,7 @@ services: - TZ=Asia/Shanghai - NGINX_PORT=${PANEL_APP_PORT_HTTP:-8080} - AMMDS_SERVER_PORT=${PANEL_APP_PORT_API:-9523} - image: qyg2297248353/ammds:v1.4.13 + image: qyg2297248353/ammds:v1.5.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE:-host} diff --git a/apps/ammds/1.4.13/envs/default.env b/apps/ammds/1.5.1/envs/default.env similarity index 100% rename from apps/ammds/1.4.13/envs/default.env rename to apps/ammds/1.5.1/envs/default.env diff --git a/apps/ammds/1.4.13/envs/global.env b/apps/ammds/1.5.1/envs/global.env similarity index 100% rename from apps/ammds/1.4.13/envs/global.env rename to apps/ammds/1.5.1/envs/global.env diff --git a/apps/ammds/1.4.13/scripts/init.sh b/apps/ammds/1.5.1/scripts/init.sh similarity index 100% rename from apps/ammds/1.4.13/scripts/init.sh rename to apps/ammds/1.5.1/scripts/init.sh diff --git a/apps/ammds/1.4.13/scripts/uninstall.sh b/apps/ammds/1.5.1/scripts/uninstall.sh similarity index 100% rename from apps/ammds/1.4.13/scripts/uninstall.sh rename to apps/ammds/1.5.1/scripts/uninstall.sh diff --git a/apps/ammds/1.4.13/scripts/upgrade.sh b/apps/ammds/1.5.1/scripts/upgrade.sh similarity index 100% rename from apps/ammds/1.4.13/scripts/upgrade.sh rename to apps/ammds/1.5.1/scripts/upgrade.sh diff --git a/apps/beszel-agent/0.11.0/.env b/apps/beszel-agent/0.11.1/.env similarity index 100% rename from apps/beszel-agent/0.11.0/.env rename to apps/beszel-agent/0.11.1/.env diff --git a/apps/beszel-agent/0.11.0/data.yml b/apps/beszel-agent/0.11.1/data.yml similarity index 100% rename from apps/beszel-agent/0.11.0/data.yml rename to apps/beszel-agent/0.11.1/data.yml diff --git a/apps/beszel-agent/0.11.0/docker-compose.yml b/apps/beszel-agent/0.11.1/docker-compose.yml similarity index 92% rename from apps/beszel-agent/0.11.0/docker-compose.yml rename to apps/beszel-agent/0.11.1/docker-compose.yml index 5ffadd3..a5a3c3b 100644 --- a/apps/beszel-agent/0.11.0/docker-compose.yml +++ b/apps/beszel-agent/0.11.1/docker-compose.yml @@ -11,7 +11,7 @@ services: - TZ=Asia/Shanghai - LOG_LEVEL=info - PORT=${PANEL_APP_PORT_HTTP:-45876} - image: henrygd/beszel-agent:0.11.0 + image: henrygd/beszel-agent:0.11.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE:-host} diff --git a/apps/beszel-agent/0.11.0/envs/default.env b/apps/beszel-agent/0.11.1/envs/default.env similarity index 100% rename from apps/beszel-agent/0.11.0/envs/default.env rename to apps/beszel-agent/0.11.1/envs/default.env diff --git a/apps/beszel-agent/0.11.0/envs/global.env b/apps/beszel-agent/0.11.1/envs/global.env similarity index 100% rename from apps/beszel-agent/0.11.0/envs/global.env rename to apps/beszel-agent/0.11.1/envs/global.env diff --git a/apps/beszel-agent/0.11.0/scripts/init.sh b/apps/beszel-agent/0.11.1/scripts/init.sh similarity index 100% rename from apps/beszel-agent/0.11.0/scripts/init.sh rename to apps/beszel-agent/0.11.1/scripts/init.sh diff --git a/apps/beszel-agent/0.11.0/scripts/uninstall.sh b/apps/beszel-agent/0.11.1/scripts/uninstall.sh similarity index 100% rename from apps/beszel-agent/0.11.0/scripts/uninstall.sh rename to apps/beszel-agent/0.11.1/scripts/uninstall.sh diff --git a/apps/beszel-agent/0.11.0/scripts/upgrade.sh b/apps/beszel-agent/0.11.1/scripts/upgrade.sh similarity index 100% rename from apps/beszel-agent/0.11.0/scripts/upgrade.sh rename to apps/beszel-agent/0.11.1/scripts/upgrade.sh diff --git a/apps/beszel/0.11.0/.env b/apps/beszel/0.11.1/.env similarity index 100% rename from apps/beszel/0.11.0/.env rename to apps/beszel/0.11.1/.env diff --git a/apps/beszel/0.11.0/data.yml b/apps/beszel/0.11.1/data.yml similarity index 100% rename from apps/beszel/0.11.0/data.yml rename to apps/beszel/0.11.1/data.yml diff --git a/apps/beszel/0.11.0/docker-compose.yml b/apps/beszel/0.11.1/docker-compose.yml similarity index 91% rename from apps/beszel/0.11.0/docker-compose.yml rename to apps/beszel/0.11.1/docker-compose.yml index 279aeb9..f138321 100644 --- a/apps/beszel/0.11.0/docker-compose.yml +++ b/apps/beszel/0.11.1/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: henrygd/beszel:0.11.0 + image: henrygd/beszel:0.11.1 labels: createdBy: Apps networks: diff --git a/apps/beszel/0.11.0/envs/default.env b/apps/beszel/0.11.1/envs/default.env similarity index 100% rename from apps/beszel/0.11.0/envs/default.env rename to apps/beszel/0.11.1/envs/default.env diff --git a/apps/beszel/0.11.0/envs/global.env b/apps/beszel/0.11.1/envs/global.env similarity index 100% rename from apps/beszel/0.11.0/envs/global.env rename to apps/beszel/0.11.1/envs/global.env diff --git a/apps/beszel/0.11.0/scripts/init.sh b/apps/beszel/0.11.1/scripts/init.sh similarity index 100% rename from apps/beszel/0.11.0/scripts/init.sh rename to apps/beszel/0.11.1/scripts/init.sh diff --git a/apps/beszel/0.11.0/scripts/uninstall.sh b/apps/beszel/0.11.1/scripts/uninstall.sh similarity index 100% rename from apps/beszel/0.11.0/scripts/uninstall.sh rename to apps/beszel/0.11.1/scripts/uninstall.sh diff --git a/apps/beszel/0.11.0/scripts/upgrade.sh b/apps/beszel/0.11.1/scripts/upgrade.sh similarity index 100% rename from apps/beszel/0.11.0/scripts/upgrade.sh rename to apps/beszel/0.11.1/scripts/upgrade.sh diff --git a/apps/logto/1.26.0/.env b/apps/logto/1.27.0/.env similarity index 100% rename from apps/logto/1.26.0/.env rename to apps/logto/1.27.0/.env diff --git a/apps/logto/1.26.0/data.yml b/apps/logto/1.27.0/data.yml similarity index 100% rename from apps/logto/1.26.0/data.yml rename to apps/logto/1.27.0/data.yml diff --git a/apps/logto/1.26.0/docker-compose.yml b/apps/logto/1.27.0/docker-compose.yml similarity index 95% rename from apps/logto/1.26.0/docker-compose.yml rename to apps/logto/1.27.0/docker-compose.yml index dba46c2..adf130a 100644 --- a/apps/logto/1.26.0/docker-compose.yml +++ b/apps/logto/1.27.0/docker-compose.yml @@ -18,7 +18,7 @@ services: - TRUST_PROXY_HEADER=true - CASE_SENSITIVE_USERNAME=true - DB_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_NAME} - image: svhd/logto:1.26.0 + image: svhd/logto:1.27.0 labels: createdBy: Apps networks: diff --git a/apps/logto/1.26.0/envs/default.env b/apps/logto/1.27.0/envs/default.env similarity index 100% rename from apps/logto/1.26.0/envs/default.env rename to apps/logto/1.27.0/envs/default.env diff --git a/apps/logto/1.26.0/envs/global.env b/apps/logto/1.27.0/envs/global.env similarity index 100% rename from apps/logto/1.26.0/envs/global.env rename to apps/logto/1.27.0/envs/global.env diff --git a/apps/logto/1.26.0/scripts/init.sh b/apps/logto/1.27.0/scripts/init.sh similarity index 100% rename from apps/logto/1.26.0/scripts/init.sh rename to apps/logto/1.27.0/scripts/init.sh diff --git a/apps/logto/1.26.0/scripts/uninstall.sh b/apps/logto/1.27.0/scripts/uninstall.sh similarity index 100% rename from apps/logto/1.26.0/scripts/uninstall.sh rename to apps/logto/1.27.0/scripts/uninstall.sh diff --git a/apps/logto/1.26.0/scripts/upgrade.sh b/apps/logto/1.27.0/scripts/upgrade.sh similarity index 100% rename from apps/logto/1.26.0/scripts/upgrade.sh rename to apps/logto/1.27.0/scripts/upgrade.sh diff --git a/apps/n8n/1.90.2/.env b/apps/n8n/1.91.0/.env similarity index 100% rename from apps/n8n/1.90.2/.env rename to apps/n8n/1.91.0/.env diff --git a/apps/n8n/1.90.2/data.yml b/apps/n8n/1.91.0/data.yml similarity index 100% rename from apps/n8n/1.90.2/data.yml rename to apps/n8n/1.91.0/data.yml diff --git a/apps/n8n/1.90.2/docker-compose.yml b/apps/n8n/1.91.0/docker-compose.yml similarity index 94% rename from apps/n8n/1.90.2/docker-compose.yml rename to apps/n8n/1.91.0/docker-compose.yml index 959ac0d..6898cb1 100644 --- a/apps/n8n/1.90.2/docker-compose.yml +++ b/apps/n8n/1.91.0/docker-compose.yml @@ -14,7 +14,7 @@ services: - N8N_PROTOCOL=http - N8N_DIAGNOSTICS_ENABLED=false - N8N_SECURE_COOKIE=false - image: n8nio/n8n:1.90.2 + image: n8nio/n8n:1.91.0 labels: createdBy: Apps networks: diff --git a/apps/n8n/1.90.2/envs/default.env b/apps/n8n/1.91.0/envs/default.env similarity index 100% rename from apps/n8n/1.90.2/envs/default.env rename to apps/n8n/1.91.0/envs/default.env diff --git a/apps/n8n/1.90.2/envs/global.env b/apps/n8n/1.91.0/envs/global.env similarity index 100% rename from apps/n8n/1.90.2/envs/global.env rename to apps/n8n/1.91.0/envs/global.env diff --git a/apps/n8n/1.90.2/scripts/init.sh b/apps/n8n/1.91.0/scripts/init.sh similarity index 100% rename from apps/n8n/1.90.2/scripts/init.sh rename to apps/n8n/1.91.0/scripts/init.sh diff --git a/apps/n8n/1.90.2/scripts/uninstall.sh b/apps/n8n/1.91.0/scripts/uninstall.sh similarity index 100% rename from apps/n8n/1.90.2/scripts/uninstall.sh rename to apps/n8n/1.91.0/scripts/uninstall.sh diff --git a/apps/n8n/1.90.2/scripts/upgrade.sh b/apps/n8n/1.91.0/scripts/upgrade.sh similarity index 100% rename from apps/n8n/1.90.2/scripts/upgrade.sh rename to apps/n8n/1.91.0/scripts/upgrade.sh diff --git a/apps/nacos/2.5.1/.env b/apps/nacos/2.5.1/.env new file mode 100644 index 0000000..25c0249 --- /dev/null +++ b/apps/nacos/2.5.1/.env @@ -0,0 +1,66 @@ +# MySQL 服务 (前置检查) [必填] +PANEL_DB_TYPE=mysql + +# 网络模式 [必填] +NETWORK_MODE=host + +# 数据持久化路径 [必填] +NACOS_ROOT_PATH=/home/nacos + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=8848 + +# Nacos gRPC 客户端端口 [必填] +PANEL_APP_PORT_GRPC_CLIENT=9848 + +# Nacos gRPC 服务端端口 [必填] +PANEL_APP_PORT_GRPC_SERVER=9849 + +# IP模式/域名模式 [必填] +PREFER_HOST_MODE=ip + +# 服务IP [必填] +NACOS_SERVER_IP= + +# Nacos身份验证密钥键 [必填] +NACOS_AUTH_IDENTITY_KEY=serverIdentity + +# Nacos身份验证密钥值 [必填] +NACOS_AUTH_IDENTITY_VALUE=security + +# Nacos身份验证令牌（至少32位字符的Base64编码） [必填] +NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789 + +# JVM_XMS (初始内存大小) [必填] +JVM_XMS=512m + +# JVM_XMX (最大内存大小) [必填] +JVM_XMX=2g + +# JVM_XMN (新生代内存) [必填] +JVM_XMN=128m + +# JVM_MS (初始元空间大小) [必填] +JVM_MS=128m + +# JVM_MMS (最大元空间大小) [必填] +JVM_MMS=320m + +# 数据库 主机 [必填] +MYSQL_SERVICE_HOST=127.0.0.1 + +# 数据库 端口 [必填] +MYSQL_SERVICE_PORT=3306 + +# 数据库 用户名 [必填] +MYSQL_SERVICE_USER=nacos + +# 数据库 密码 [必填] +MYSQL_SERVICE_PASSWORD= + +# 数据库 名称 [必填] +MYSQL_SERVICE_DB_NAME=nacos + +# 数据库 连接参数 [必填] +MYSQL_SERVICE_DB_PARAM=characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + diff --git a/apps/nacos/2.5.1/data.yml b/apps/nacos/2.5.1/data.yml new file mode 100644 index 0000000..e60115e --- /dev/null +++ b/apps/nacos/2.5.1/data.yml @@ -0,0 +1,185 @@ +additionalProperties: + formFields: + - child: + default: "" + envKey: PANEL_DB_HOST + required: true + type: service + default: mysql + edit: true + envKey: PANEL_DB_TYPE + labelZh: MySQL 服务 (前置检查) + labelEn: Database Service (Pre-check) + required: true + type: apps + values: + - label: MySQL + value: mysql + - label: MariaDB + value: mariadb + - label: Percona + value: percona + - default: "host" + edit: true + envKey: NETWORK_MODE + labelEn: Drive path + labelZh: 网络模式 + required: true + type: select + values: + - label: 主机网络模式 + value: "host" + - label: 桥接网络模式 + value: "bridge" + - label: 无网络模式 + value: "none" + - label: 1panel-network + value: "1panel-network" + - default: "/home/nacos" + edit: true + envKey: NACOS_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text + - default: 8848 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: WebUI 端口 + labelEn: WebUI port + required: true + rule: paramPort + type: number + - default: 9848 + edit: true + envKey: PANEL_APP_PORT_GRPC_CLIENT + labelZh: Nacos gRPC 客户端端口 + labelEn: Nacos gRPC client port + required: true + rule: paramPort + type: number + - default: 9849 + edit: true + envKey: PANEL_APP_PORT_GRPC_SERVER + labelZh: Nacos gRPC 服务端端口 + labelEn: Nacos gRPC server port + required: true + rule: paramPort + type: number + - default: "ip" + envKey: PREFER_HOST_MODE + labelZh: IP模式/域名模式 + labelEn: IP mode/hostname mode + required: true + type: select + values: + - label: IP模式 + value: "ip" + - label: 域名模式 + value: "hostname" + - default: "" + edit: true + envKey: NACOS_SERVER_IP + labelZh: 服务IP + labelEn: Server IP + required: true + type: text + - default: "serverIdentity" + edit: true + envKey: NACOS_AUTH_IDENTITY_KEY + labelZh: Nacos身份验证密钥键 + labelEn: Nacos auth identity key + required: true + type: text + - default: "security" + edit: true + envKey: NACOS_AUTH_IDENTITY_VALUE + labelZh: Nacos身份验证密钥值 + labelEn: Nacos auth identity value + required: true + type: text + - default: "SecretKey012345678901234567890123456789012345678901234567890123456789" + edit: true + envKey: NACOS_AUTH_TOKEN + labelZh: Nacos身份验证令牌（至少32位字符的Base64编码） + labelEn: Nacos auth token + required: true + type: text + - default: "512m" + edit: true + envKey: JVM_XMS + labelZh: JVM_XMS (初始内存大小) + labelEn: JVM_XMS (Initial memory size) + required: true + type: text + - default: "2g" + edit: true + envKey: JVM_XMX + labelEn: JVM_XMX (Maximum memory size) + labelZh: JVM_XMX (最大内存大小) + required: true + type: text + - default: "128m" + edit: true + envKey: JVM_XMN + labelEn: JVM_XMN (New generation memory) + labelZh: JVM_XMN (新生代内存) + required: true + type: text + - default: "128m" + edit: true + envKey: JVM_MS + labelEn: JVM_MS (Initial metaspace) + labelZh: JVM_MS (初始元空间大小) + required: true + type: text + - default: "320m" + edit: true + envKey: JVM_MMS + labelEn: JVM_MMS (Maximum metaspace) + labelZh: JVM_MMS (最大元空间大小) + required: true + type: text + - default: "127.0.0.1" + edit: true + envKey: MYSQL_SERVICE_HOST + labelZh: 数据库 主机 + labelEn: Database Host + required: true + type: text + - default: 3306 + edit: true + envKey: MYSQL_SERVICE_PORT + labelZh: 数据库 端口 + labelEn: Database Port + required: true + rule: paramPort + type: number + - default: "nacos" + edit: true + envKey: MYSQL_SERVICE_USER + labelZh: 数据库 用户名 + labelEn: Database Username + required: true + type: text + - default: "" + edit: true + envKey: MYSQL_SERVICE_PASSWORD + labelZh: 数据库 密码 + labelEn: Database Password + required: true + type: password + - default: "nacos" + edit: true + envKey: MYSQL_SERVICE_DB_NAME + labelZh: 数据库 名称 + labelEn: Database Name + required: true + type: text + - default: "characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true" + edit: true + envKey: MYSQL_SERVICE_DB_PARAM + labelZh: 数据库 连接参数 + labelEn: Database Connection Parameters + required: true + type: text diff --git a/apps/nacos/2.5.1/docker-compose.yml b/apps/nacos/2.5.1/docker-compose.yml new file mode 100644 index 0000000..21c1635 --- /dev/null +++ b/apps/nacos/2.5.1/docker-compose.yml @@ -0,0 +1,26 @@ +networks: + 1panel-network: + external: true +services: + nacos: + container_name: nacos + env_file: + - ./envs/global.env + - .env + environment: + - MODE=standalone + - NACOS_SERVER_PORT=8848 + - NACOS_AUTH_ENABLE=true + - SPRING_DATASOURCE_PLATFORM=mysql + image: nacos/nacos-server:v2.5.1 + labels: + createdBy: Apps + network_mode: ${NETWORK_MODE} + ports: + - ${PANEL_APP_PORT_HTTP}:8848 + - ${PANEL_APP_PORT_GRPC_CLIENT}:9848 + - ${PANEL_APP_PORT_GRPC_SERVER}:9849 + restart: always + volumes: + - ${NACOS_ROOT_PATH}/logs:/home/nacos/logs + - ${NACOS_ROOT_PATH}/data:/home/nacos/data diff --git a/apps/weblate/5.11.1.0/envs/default.env b/apps/nacos/2.5.1/envs/default.env similarity index 100% rename from apps/weblate/5.11.1.0/envs/default.env rename to apps/nacos/2.5.1/envs/default.env diff --git a/apps/weblate/5.11.1.0/envs/global.env b/apps/nacos/2.5.1/envs/global.env similarity index 100% rename from apps/weblate/5.11.1.0/envs/global.env rename to apps/nacos/2.5.1/envs/global.env diff --git a/apps/nacos/2.5.1/init/mysql-schema.sql b/apps/nacos/2.5.1/init/mysql-schema.sql new file mode 100644 index 0000000..067d67a --- /dev/null +++ b/apps/nacos/2.5.1/init/mysql-schema.sql @@ -0,0 +1,227 @@ +/* + * Copyright 1999-2018 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/******************************************/ +/* 表名称 = config_info */ +/******************************************/ +CREATE TABLE `config_info` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', + `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', + `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', + `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', + `c_schema` text COMMENT '配置的模式', + `encrypted_data_key` text NOT NULL COMMENT '密钥', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; + +/******************************************/ +/* 表名称 = config_info_aggr */ +/******************************************/ +CREATE TABLE `config_info_aggr` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `datum_id` varchar(255) NOT NULL COMMENT 'datum_id', + `content` longtext NOT NULL COMMENT '内容', + `gmt_modified` datetime NOT NULL COMMENT '修改时间', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段'; + + +/******************************************/ +/* 表名称 = config_info_beta */ +/******************************************/ +CREATE TABLE `config_info_beta` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text NOT NULL COMMENT '密钥', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; + +/******************************************/ +/* 表名称 = config_info_tag */ +/******************************************/ +CREATE TABLE `config_info_tag` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `tag_id` varchar(128) NOT NULL COMMENT 'tag_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag'; + +/******************************************/ +/* 表名称 = config_tags_relation */ +/******************************************/ +CREATE TABLE `config_tags_relation` +( + `id` bigint(20) NOT NULL COMMENT 'id', + `tag_name` varchar(128) NOT NULL COMMENT 'tag_name', + `tag_type` varchar(64) DEFAULT NULL COMMENT 'tag_type', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `nid` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增长标识', + PRIMARY KEY (`nid`), + UNIQUE KEY `uk_configtagrelation_configidtag` (`id`,`tag_name`,`tag_type`), + KEY `idx_tenant_id` (`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_tag_relation'; + +/******************************************/ +/* 表名称 = group_capacity */ +/******************************************/ +CREATE TABLE `group_capacity` +( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `group_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Group ID，空字符表示整个集群', + `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值', + `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量', + `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值', + `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数，，0表示使用默认值', + `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值', + `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_group_id` (`group_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='集群、各Group容量信息表'; + +/******************************************/ +/* 表名称 = his_config_info */ +/******************************************/ +CREATE TABLE `his_config_info` +( + `id` bigint(20) unsigned NOT NULL COMMENT 'id', + `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增标识', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `op_type` char(10) DEFAULT NULL COMMENT 'operation type', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text NOT NULL COMMENT '密钥', + PRIMARY KEY (`nid`), + KEY `idx_gmt_create` (`gmt_create`), + KEY `idx_gmt_modified` (`gmt_modified`), + KEY `idx_did` (`data_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='多租户改造'; + + +/******************************************/ +/* 表名称 = tenant_capacity */ +/******************************************/ +CREATE TABLE `tenant_capacity` +( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `tenant_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Tenant ID', + `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值', + `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量', + `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值', + `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数', + `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值', + `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_tenant_id` (`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='租户容量信息表'; + + +CREATE TABLE `tenant_info` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `kp` varchar(128) NOT NULL COMMENT 'kp', + `tenant_id` varchar(128) default '' COMMENT 'tenant_id', + `tenant_name` varchar(128) default '' COMMENT 'tenant_name', + `tenant_desc` varchar(256) DEFAULT NULL COMMENT 'tenant_desc', + `create_source` varchar(32) DEFAULT NULL COMMENT 'create_source', + `gmt_create` bigint(20) NOT NULL COMMENT '创建时间', + `gmt_modified` bigint(20) NOT NULL COMMENT '修改时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_tenant_info_kptenantid` (`kp`,`tenant_id`), + KEY `idx_tenant_id` (`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='tenant_info'; + +CREATE TABLE `users` +( + `username` varchar(50) NOT NULL PRIMARY KEY COMMENT 'username', + `password` varchar(500) NOT NULL COMMENT 'password', + `enabled` boolean NOT NULL COMMENT 'enabled' +); + +CREATE TABLE `roles` +( + `username` varchar(50) NOT NULL COMMENT 'username', + `role` varchar(50) NOT NULL COMMENT 'role', + UNIQUE INDEX `idx_user_role` (`username` ASC, `role` ASC) USING BTREE +); + +CREATE TABLE `permissions` +( + `role` varchar(50) NOT NULL COMMENT 'role', + `resource` varchar(128) NOT NULL COMMENT 'resource', + `action` varchar(8) NOT NULL COMMENT 'action', + UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE +); + +INSERT INTO users (username, password, enabled) +VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); + +INSERT INTO roles (username, role) +VALUES ('nacos', 'ROLE_ADMIN'); diff --git a/apps/nacos/2.5.1/scripts/init.sh b/apps/nacos/2.5.1/scripts/init.sh new file mode 100644 index 0000000..19193ac --- /dev/null +++ b/apps/nacos/2.5.1/scripts/init.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + if command -v mysql &> /dev/null; then + if [[ -f ./init/mysql-schema.sql ]]; then + mysql -u"$MYSQL_SERVICE_USER" -p"$MYSQL_SERVICE_PASSWORD" -h"$MYSQL_SERVICE_HOST" -P"$MYSQL_SERVICE_PORT" --protocol=TCP "$MYSQL_SERVICE_DB_NAME" < ./init/mysql-schema.sql + else + echo "mysql-schema.sql not found." + fi + else + echo "mysql command not found." + fi + + echo "Check Finish." +else + echo "Error: .env file not found." +fi diff --git a/apps/weblate/5.11.1.0/scripts/uninstall.sh b/apps/nacos/2.5.1/scripts/uninstall.sh similarity index 100% rename from apps/weblate/5.11.1.0/scripts/uninstall.sh rename to apps/nacos/2.5.1/scripts/uninstall.sh diff --git a/apps/nacos/2.5.1/scripts/upgrade.sh b/apps/nacos/2.5.1/scripts/upgrade.sh new file mode 100644 index 0000000..07fb8c3 --- /dev/null +++ b/apps/nacos/2.5.1/scripts/upgrade.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/nacos/3.0.0/.env b/apps/nacos/3.0.0/.env index 25c0249..582f94f 100644 --- a/apps/nacos/3.0.0/.env +++ b/apps/nacos/3.0.0/.env @@ -1,20 +1,17 @@ -# MySQL 服务 (前置检查) [必填] +# MySQL 服务 (前置检查) PANEL_DB_TYPE=mysql -# 网络模式 [必填] -NETWORK_MODE=host - # 数据持久化路径 [必填] NACOS_ROOT_PATH=/home/nacos # WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=8848 +PANEL_APP_PORT_HTTP=8080 -# Nacos gRPC 客户端端口 [必填] -PANEL_APP_PORT_GRPC_CLIENT=9848 +# WebUI API 端口 [必填] +PANEL_APP_PORT_API=8848 -# Nacos gRPC 服务端端口 [必填] -PANEL_APP_PORT_GRPC_SERVER=9849 +# Nacos gRPC 端口 [必填] +PANEL_APP_PORT_GRPC=9848 # IP模式/域名模式 [必填] PREFER_HOST_MODE=ip diff --git a/apps/nacos/3.0.0/data.yml b/apps/nacos/3.0.0/data.yml index e60115e..6ce0f1b 100644 --- a/apps/nacos/3.0.0/data.yml +++ b/apps/nacos/3.0.0/data.yml @@ -3,14 +3,14 @@ additionalProperties: - child: default: "" envKey: PANEL_DB_HOST - required: true + required: false type: service default: mysql edit: true envKey: PANEL_DB_TYPE labelZh: MySQL 服务 (前置检查) labelEn: Database Service (Pre-check) - required: true + required: false type: apps values: - label: MySQL @@ -19,22 +19,6 @@ additionalProperties: value: mariadb - label: Percona value: percona - - default: "host" - edit: true - envKey: NETWORK_MODE - labelEn: Drive path - labelZh: 网络模式 - required: true - type: select - values: - - label: 主机网络模式 - value: "host" - - label: 桥接网络模式 - value: "bridge" - - label: 无网络模式 - value: "none" - - label: 1panel-network - value: "1panel-network" - default: "/home/nacos" edit: true envKey: NACOS_ROOT_PATH @@ -42,7 +26,7 @@ additionalProperties: labelEn: Data persistence path required: true type: text - - default: 8848 + - default: 8080 edit: true envKey: PANEL_APP_PORT_HTTP labelZh: WebUI 端口 @@ -50,19 +34,19 @@ additionalProperties: required: true rule: paramPort type: number - - default: 9848 + - default: 8848 edit: true - envKey: PANEL_APP_PORT_GRPC_CLIENT - labelZh: Nacos gRPC 客户端端口 - labelEn: Nacos gRPC client port + envKey: PANEL_APP_PORT_API + labelZh: WebUI API 端口 + labelEn: WebUI API port required: true rule: paramPort type: number - - default: 9849 + - default: 9848 edit: true - envKey: PANEL_APP_PORT_GRPC_SERVER - labelZh: Nacos gRPC 服务端端口 - labelEn: Nacos gRPC server port + envKey: PANEL_APP_PORT_GRPC + labelZh: Nacos gRPC 端口 + labelEn: Nacos gRPC port required: true rule: paramPort type: number diff --git a/apps/nacos/3.0.0/docker-compose.yml b/apps/nacos/3.0.0/docker-compose.yml index dabe6b0..7f87a0d 100644 --- a/apps/nacos/3.0.0/docker-compose.yml +++ b/apps/nacos/3.0.0/docker-compose.yml @@ -9,17 +9,18 @@ services: - .env environment: - MODE=standalone - - NACOS_SERVER_PORT=8848 + - NACOS_SERVER_PORT=${PANEL_APP_PORT_API:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql image: nacos/nacos-server:v3.0.0 labels: createdBy: Apps - network_mode: ${NETWORK_MODE} + networks: + - 1panel-network ports: - - ${PANEL_APP_PORT_HTTP}:8848 - - ${PANEL_APP_PORT_GRPC_CLIENT}:9848 - - ${PANEL_APP_PORT_GRPC_SERVER}:9849 + - ${PANEL_APP_PORT_HTTP}:8080 + - ${PANEL_APP_PORT_API}:8848 + - ${PANEL_APP_PORT_GRPC}:9848 restart: always volumes: - ${NACOS_ROOT_PATH}/logs:/home/nacos/logs diff --git a/apps/nacos/3.0.0/init/mysql-schema.sql b/apps/nacos/3.0.0/init/mysql-schema.sql index e591aa9..d45ac95 100644 --- a/apps/nacos/3.0.0/init/mysql-schema.sql +++ b/apps/nacos/3.0.0/init/mysql-schema.sql @@ -65,49 +65,6 @@ CREATE TABLE `config_info_gray` KEY `idx_gmt_modified` (`gmt_modified`) ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='config_info_gray'; -/******************************************/ -/* 表名称 = config_info_beta */ -/******************************************/ -CREATE TABLE `config_info_beta` -( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', - `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; - -/******************************************/ -/* 表名称 = config_info_tag */ -/******************************************/ -CREATE TABLE `config_info_tag` -( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', - `tag_id` varchar(128) NOT NULL COMMENT 'tag_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', - `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag'; - /******************************************/ /* 表名称 = config_tags_relation */ /******************************************/ diff --git a/apps/nacos/README.md b/apps/nacos/README.md index 3c14468..054a858 100644 --- a/apps/nacos/README.md +++ b/apps/nacos/README.md @@ -86,6 +86,8 @@ Nacos ## 升级说明 +> [升级手册](https://nacos.io/docs/latest/manual/admin/upgrading/) + ### 2.5.0 表结构发生变化 diff --git a/apps/weblate/5.11.1.0/.env b/apps/weblate/5.11.1.1/.env similarity index 100% rename from apps/weblate/5.11.1.0/.env rename to apps/weblate/5.11.1.1/.env diff --git a/apps/weblate/5.11.1.0/data.yml b/apps/weblate/5.11.1.1/data.yml similarity index 100% rename from apps/weblate/5.11.1.0/data.yml rename to apps/weblate/5.11.1.1/data.yml diff --git a/apps/weblate/5.11.1.0/docker-compose.yml b/apps/weblate/5.11.1.1/docker-compose.yml similarity index 94% rename from apps/weblate/5.11.1.0/docker-compose.yml rename to apps/weblate/5.11.1.1/docker-compose.yml index 8bb5b59..9b61959 100644 --- a/apps/weblate/5.11.1.0/docker-compose.yml +++ b/apps/weblate/5.11.1.1/docker-compose.yml @@ -16,7 +16,7 @@ services: - WEBLATE_ALLOWED_HOSTS=* - POSTGRES_DATABASE=weblate - CLIENT_MAX_BODY_SIZE=200M - image: weblate/weblate:5.11.1.0 + image: weblate/weblate:5.11.1.1 labels: createdBy: Apps networks: diff --git a/apps/weblate/5.11.1.1/envs/default.env b/apps/weblate/5.11.1.1/envs/default.env new file mode 100644 index 0000000..cd05f46 --- /dev/null +++ b/apps/weblate/5.11.1.1/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/weblate/5.11.1.1/envs/global.env b/apps/weblate/5.11.1.1/envs/global.env new file mode 100644 index 0000000..e10989f --- /dev/null +++ b/apps/weblate/5.11.1.1/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/weblate/5.11.1.0/scripts/init.sh b/apps/weblate/5.11.1.1/scripts/init.sh similarity index 100% rename from apps/weblate/5.11.1.0/scripts/init.sh rename to apps/weblate/5.11.1.1/scripts/init.sh diff --git a/apps/weblate/5.11.1.1/scripts/uninstall.sh b/apps/weblate/5.11.1.1/scripts/uninstall.sh new file mode 100644 index 0000000..c86c4fb --- /dev/null +++ b/apps/weblate/5.11.1.1/scripts/uninstall.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/weblate/5.11.1.0/scripts/upgrade.sh b/apps/weblate/5.11.1.1/scripts/upgrade.sh similarity index 100% rename from apps/weblate/5.11.1.0/scripts/upgrade.sh rename to apps/weblate/5.11.1.1/scripts/upgrade.sh