From e4d5dacb00d76d96a855a21bcb6341009ead7058 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Mon, 15 Sep 2025 03:39:50 +0000 Subject: [PATCH] Processed apps directory via GitHub Actions --- .../astrbot-napcat/{4.8.110 => 4.8.113}/.env | 0 .../{4.8.110 => 4.8.113}/data.yml | 0 .../{4.8.110 => 4.8.113}/docker-compose.yml | 2 +- .../{4.8.110 => 4.8.113}/envs/default.env | 0 .../{4.8.110 => 4.8.113}/envs/global.env | 0 .../{4.8.110 => 4.8.113}/scripts/init.sh | 0 .../{4.8.110 => 4.8.113}/scripts/uninstall.sh | 0 .../{4.8.110 => 4.8.113}/scripts/upgrade.sh | 0 appstore/nodepassdash/{3.0.0 => 3.0.2}/.env | 0 .../nodepassdash/{3.0.0 => 3.0.2}/data.yml | 0 .../nodepassdash/3.0.2}/docker-compose.yml | 2 +- .../{3.0.0 => 3.0.2}/envs/default.env | 0 .../{3.0.0 => 3.0.2}/envs/global.env | 0 .../{3.0.0 => 3.0.2}/scripts/init.sh | 0 .../{3.0.0 => 3.0.2}/scripts/uninstall.sh | 0 .../{3.0.0 => 3.0.2}/scripts/upgrade.sh | 0 appstore/rustdesk-api/{2.6.28 => 2.6.29}/.env | 0 .../{2.6.28 => 2.6.29}/conf/hbbr/run | 0 .../{2.6.28 => 2.6.29}/conf/hbbs/run | 0 .../rustdesk-api/{2.6.28 => 2.6.29}/data.yml | 0 .../{2.6.28 => 2.6.29}/docker-compose.yml | 2 +- .../{2.6.28 => 2.6.29}/envs/default.env | 0 .../{2.6.28 => 2.6.29}/envs/global.env | 0 .../{2.6.28 => 2.6.29}/scripts/init.sh | 0 .../{2.6.28 => 2.6.29}/scripts/uninstall.sh | 0 .../{2.6.28 => 2.6.29}/scripts/upgrade.sh | 0 appstore/weblate/{5.13.2.0 => 5.13.3.0}/.env | 0 .../weblate/{5.13.2.0 => 5.13.3.0}/data.yml | 0 .../{5.13.2.0 => 5.13.3.0}/docker-compose.yml | 2 +- .../{5.13.2.0 => 5.13.3.0}/envs/default.env | 0 .../{5.13.2.0 => 5.13.3.0}/envs/global.env | 0 .../{5.13.2.0 => 5.13.3.0}/scripts/init.sh | 0 .../scripts/uninstall.sh | 0 .../{5.13.2.0 => 5.13.3.0}/scripts/upgrade.sh | 0 dockge/astrbot-napcat/docker-compose.yml | 2 +- dockge/nodepassdash/docker-compose.yml | 2 +- .../.env | 0 .../nodepassdash_2_2_1}/docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/rustdesk-api/.env | 2 +- dockge/rustdesk-api/docker-compose.yml | 27 +++++-------------- .../.env | 2 +- .../conf/hbbr/run | 0 .../conf/hbbs/run | 0 .../docker-compose.yml | 27 ++++++++++++++----- .../envs/default.env | 0 .../envs/global.env | 0 dockge/weblate/docker-compose.yml | 2 +- 49 files changed, 37 insertions(+), 37 deletions(-) rename appstore/astrbot-napcat/{4.8.110 => 4.8.113}/.env (100%) rename appstore/astrbot-napcat/{4.8.110 => 4.8.113}/data.yml (100%) rename appstore/astrbot-napcat/{4.8.110 => 4.8.113}/docker-compose.yml (96%) rename appstore/astrbot-napcat/{4.8.110 => 4.8.113}/envs/default.env (100%) rename appstore/astrbot-napcat/{4.8.110 => 4.8.113}/envs/global.env (100%) rename appstore/astrbot-napcat/{4.8.110 => 4.8.113}/scripts/init.sh (100%) rename appstore/astrbot-napcat/{4.8.110 => 4.8.113}/scripts/uninstall.sh (100%) rename appstore/astrbot-napcat/{4.8.110 => 4.8.113}/scripts/upgrade.sh (100%) rename appstore/nodepassdash/{3.0.0 => 3.0.2}/.env (100%) rename appstore/nodepassdash/{3.0.0 => 3.0.2}/data.yml (100%) rename {dockge/nodepassdash_3_0_0 => appstore/nodepassdash/3.0.2}/docker-compose.yml (90%) rename appstore/nodepassdash/{3.0.0 => 3.0.2}/envs/default.env (100%) rename appstore/nodepassdash/{3.0.0 => 3.0.2}/envs/global.env (100%) rename appstore/nodepassdash/{3.0.0 => 3.0.2}/scripts/init.sh (100%) rename appstore/nodepassdash/{3.0.0 => 3.0.2}/scripts/uninstall.sh (100%) rename appstore/nodepassdash/{3.0.0 => 3.0.2}/scripts/upgrade.sh (100%) rename appstore/rustdesk-api/{2.6.28 => 2.6.29}/.env (100%) rename appstore/rustdesk-api/{2.6.28 => 2.6.29}/conf/hbbr/run (100%) rename appstore/rustdesk-api/{2.6.28 => 2.6.29}/conf/hbbs/run (100%) rename appstore/rustdesk-api/{2.6.28 => 2.6.29}/data.yml (100%) rename appstore/rustdesk-api/{2.6.28 => 2.6.29}/docker-compose.yml (96%) rename appstore/rustdesk-api/{2.6.28 => 2.6.29}/envs/default.env (100%) rename appstore/rustdesk-api/{2.6.28 => 2.6.29}/envs/global.env (100%) rename appstore/rustdesk-api/{2.6.28 => 2.6.29}/scripts/init.sh (100%) rename appstore/rustdesk-api/{2.6.28 => 2.6.29}/scripts/uninstall.sh (100%) rename appstore/rustdesk-api/{2.6.28 => 2.6.29}/scripts/upgrade.sh (100%) rename appstore/weblate/{5.13.2.0 => 5.13.3.0}/.env (100%) rename appstore/weblate/{5.13.2.0 => 5.13.3.0}/data.yml (100%) rename appstore/weblate/{5.13.2.0 => 5.13.3.0}/docker-compose.yml (94%) rename appstore/weblate/{5.13.2.0 => 5.13.3.0}/envs/default.env (100%) rename appstore/weblate/{5.13.2.0 => 5.13.3.0}/envs/global.env (100%) rename appstore/weblate/{5.13.2.0 => 5.13.3.0}/scripts/init.sh (100%) rename appstore/weblate/{5.13.2.0 => 5.13.3.0}/scripts/uninstall.sh (100%) rename appstore/weblate/{5.13.2.0 => 5.13.3.0}/scripts/upgrade.sh (100%) rename dockge/{nodepassdash_3_0_0 => nodepassdash_2_2_1}/.env (100%) rename {appstore/nodepassdash/3.0.0 => dockge/nodepassdash_2_2_1}/docker-compose.yml (90%) rename dockge/{nodepassdash_3_0_0 => nodepassdash_2_2_1}/envs/default.env (100%) rename dockge/{nodepassdash_3_0_0 => nodepassdash_2_2_1}/envs/global.env (100%) rename dockge/{rustdesk-api_s6-latest => rustdesk-api_2_6_29}/.env (97%) rename dockge/{rustdesk-api_s6-latest => rustdesk-api_2_6_29}/conf/hbbr/run (100%) rename dockge/{rustdesk-api_s6-latest => rustdesk-api_2_6_29}/conf/hbbs/run (100%) rename dockge/{rustdesk-api_s6-latest => rustdesk-api_2_6_29}/docker-compose.yml (70%) rename dockge/{rustdesk-api_s6-latest => rustdesk-api_2_6_29}/envs/default.env (100%) rename dockge/{rustdesk-api_s6-latest => rustdesk-api_2_6_29}/envs/global.env (100%) diff --git a/appstore/astrbot-napcat/4.8.110/.env b/appstore/astrbot-napcat/4.8.113/.env similarity index 100% rename from appstore/astrbot-napcat/4.8.110/.env rename to appstore/astrbot-napcat/4.8.113/.env diff --git a/appstore/astrbot-napcat/4.8.110/data.yml b/appstore/astrbot-napcat/4.8.113/data.yml similarity index 100% rename from appstore/astrbot-napcat/4.8.110/data.yml rename to appstore/astrbot-napcat/4.8.113/data.yml diff --git a/appstore/astrbot-napcat/4.8.110/docker-compose.yml b/appstore/astrbot-napcat/4.8.113/docker-compose.yml similarity index 96% rename from appstore/astrbot-napcat/4.8.110/docker-compose.yml rename to appstore/astrbot-napcat/4.8.113/docker-compose.yml index 8de3aa79c..a74783dd3 100644 --- a/appstore/astrbot-napcat/4.8.110/docker-compose.yml +++ b/appstore/astrbot-napcat/4.8.113/docker-compose.yml @@ -36,7 +36,7 @@ services: - MODE=astrbot - NAPCAT_UID=${NAPCAT_UID:-1000} - NAPCAT_GID=${NAPCAT_GID:-1000} - image: mlikiowa/napcat-docker:v4.8.110 + image: mlikiowa/napcat-docker:v4.8.113 mac_address: ${NAPCAT_MAC_ADDRESS:-02:42:ac:11:00:02} networks: - 1panel-network diff --git a/appstore/astrbot-napcat/4.8.110/envs/default.env b/appstore/astrbot-napcat/4.8.113/envs/default.env similarity index 100% rename from appstore/astrbot-napcat/4.8.110/envs/default.env rename to appstore/astrbot-napcat/4.8.113/envs/default.env diff --git a/appstore/astrbot-napcat/4.8.110/envs/global.env b/appstore/astrbot-napcat/4.8.113/envs/global.env similarity index 100% rename from appstore/astrbot-napcat/4.8.110/envs/global.env rename to appstore/astrbot-napcat/4.8.113/envs/global.env diff --git a/appstore/astrbot-napcat/4.8.110/scripts/init.sh b/appstore/astrbot-napcat/4.8.113/scripts/init.sh similarity index 100% rename from appstore/astrbot-napcat/4.8.110/scripts/init.sh rename to appstore/astrbot-napcat/4.8.113/scripts/init.sh diff --git a/appstore/astrbot-napcat/4.8.110/scripts/uninstall.sh b/appstore/astrbot-napcat/4.8.113/scripts/uninstall.sh similarity index 100% rename from appstore/astrbot-napcat/4.8.110/scripts/uninstall.sh rename to appstore/astrbot-napcat/4.8.113/scripts/uninstall.sh diff --git a/appstore/astrbot-napcat/4.8.110/scripts/upgrade.sh b/appstore/astrbot-napcat/4.8.113/scripts/upgrade.sh similarity index 100% rename from appstore/astrbot-napcat/4.8.110/scripts/upgrade.sh rename to appstore/astrbot-napcat/4.8.113/scripts/upgrade.sh diff --git a/appstore/nodepassdash/3.0.0/.env b/appstore/nodepassdash/3.0.2/.env similarity index 100% rename from appstore/nodepassdash/3.0.0/.env rename to appstore/nodepassdash/3.0.2/.env diff --git a/appstore/nodepassdash/3.0.0/data.yml b/appstore/nodepassdash/3.0.2/data.yml similarity index 100% rename from appstore/nodepassdash/3.0.0/data.yml rename to appstore/nodepassdash/3.0.2/data.yml diff --git a/dockge/nodepassdash_3_0_0/docker-compose.yml b/appstore/nodepassdash/3.0.2/docker-compose.yml similarity index 90% rename from dockge/nodepassdash_3_0_0/docker-compose.yml rename to appstore/nodepassdash/3.0.2/docker-compose.yml index 5dda157df..a043d19bd 100644 --- a/dockge/nodepassdash_3_0_0/docker-compose.yml +++ b/appstore/nodepassdash/3.0.2/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - PORT=${PANEL_APP_PORT_HTTP} - image: ghcr.io/nodepassproject/nodepassdash:3.0.0 + image: ghcr.io/nodepassproject/nodepassdash:3.0.2 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/appstore/nodepassdash/3.0.0/envs/default.env b/appstore/nodepassdash/3.0.2/envs/default.env similarity index 100% rename from appstore/nodepassdash/3.0.0/envs/default.env rename to appstore/nodepassdash/3.0.2/envs/default.env diff --git a/appstore/nodepassdash/3.0.0/envs/global.env b/appstore/nodepassdash/3.0.2/envs/global.env similarity index 100% rename from appstore/nodepassdash/3.0.0/envs/global.env rename to appstore/nodepassdash/3.0.2/envs/global.env diff --git a/appstore/nodepassdash/3.0.0/scripts/init.sh b/appstore/nodepassdash/3.0.2/scripts/init.sh similarity index 100% rename from appstore/nodepassdash/3.0.0/scripts/init.sh rename to appstore/nodepassdash/3.0.2/scripts/init.sh diff --git a/appstore/nodepassdash/3.0.0/scripts/uninstall.sh b/appstore/nodepassdash/3.0.2/scripts/uninstall.sh similarity index 100% rename from appstore/nodepassdash/3.0.0/scripts/uninstall.sh rename to appstore/nodepassdash/3.0.2/scripts/uninstall.sh diff --git a/appstore/nodepassdash/3.0.0/scripts/upgrade.sh b/appstore/nodepassdash/3.0.2/scripts/upgrade.sh similarity index 100% rename from appstore/nodepassdash/3.0.0/scripts/upgrade.sh rename to appstore/nodepassdash/3.0.2/scripts/upgrade.sh diff --git a/appstore/rustdesk-api/2.6.28/.env b/appstore/rustdesk-api/2.6.29/.env similarity index 100% rename from appstore/rustdesk-api/2.6.28/.env rename to appstore/rustdesk-api/2.6.29/.env diff --git a/appstore/rustdesk-api/2.6.28/conf/hbbr/run b/appstore/rustdesk-api/2.6.29/conf/hbbr/run similarity index 100% rename from appstore/rustdesk-api/2.6.28/conf/hbbr/run rename to appstore/rustdesk-api/2.6.29/conf/hbbr/run diff --git a/appstore/rustdesk-api/2.6.28/conf/hbbs/run b/appstore/rustdesk-api/2.6.29/conf/hbbs/run similarity index 100% rename from appstore/rustdesk-api/2.6.28/conf/hbbs/run rename to appstore/rustdesk-api/2.6.29/conf/hbbs/run diff --git a/appstore/rustdesk-api/2.6.28/data.yml b/appstore/rustdesk-api/2.6.29/data.yml similarity index 100% rename from appstore/rustdesk-api/2.6.28/data.yml rename to appstore/rustdesk-api/2.6.29/data.yml diff --git a/appstore/rustdesk-api/2.6.28/docker-compose.yml b/appstore/rustdesk-api/2.6.29/docker-compose.yml similarity index 96% rename from appstore/rustdesk-api/2.6.28/docker-compose.yml rename to appstore/rustdesk-api/2.6.29/docker-compose.yml index 0ca8d2616..a532d45e1 100644 --- a/appstore/rustdesk-api/2.6.28/docker-compose.yml +++ b/appstore/rustdesk-api/2.6.29/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - RUSTDESK_API_LANG=zh-CN - image: lejianwen/rustdesk-api:v2.6.28 + image: lejianwen/rustdesk-api:v2.6.29 labels: createdBy: Apps networks: diff --git a/appstore/rustdesk-api/2.6.28/envs/default.env b/appstore/rustdesk-api/2.6.29/envs/default.env similarity index 100% rename from appstore/rustdesk-api/2.6.28/envs/default.env rename to appstore/rustdesk-api/2.6.29/envs/default.env diff --git a/appstore/rustdesk-api/2.6.28/envs/global.env b/appstore/rustdesk-api/2.6.29/envs/global.env similarity index 100% rename from appstore/rustdesk-api/2.6.28/envs/global.env rename to appstore/rustdesk-api/2.6.29/envs/global.env diff --git a/appstore/rustdesk-api/2.6.28/scripts/init.sh b/appstore/rustdesk-api/2.6.29/scripts/init.sh similarity index 100% rename from appstore/rustdesk-api/2.6.28/scripts/init.sh rename to appstore/rustdesk-api/2.6.29/scripts/init.sh diff --git a/appstore/rustdesk-api/2.6.28/scripts/uninstall.sh b/appstore/rustdesk-api/2.6.29/scripts/uninstall.sh similarity index 100% rename from appstore/rustdesk-api/2.6.28/scripts/uninstall.sh rename to appstore/rustdesk-api/2.6.29/scripts/uninstall.sh diff --git a/appstore/rustdesk-api/2.6.28/scripts/upgrade.sh b/appstore/rustdesk-api/2.6.29/scripts/upgrade.sh similarity index 100% rename from appstore/rustdesk-api/2.6.28/scripts/upgrade.sh rename to appstore/rustdesk-api/2.6.29/scripts/upgrade.sh diff --git a/appstore/weblate/5.13.2.0/.env b/appstore/weblate/5.13.3.0/.env similarity index 100% rename from appstore/weblate/5.13.2.0/.env rename to appstore/weblate/5.13.3.0/.env diff --git a/appstore/weblate/5.13.2.0/data.yml b/appstore/weblate/5.13.3.0/data.yml similarity index 100% rename from appstore/weblate/5.13.2.0/data.yml rename to appstore/weblate/5.13.3.0/data.yml diff --git a/appstore/weblate/5.13.2.0/docker-compose.yml b/appstore/weblate/5.13.3.0/docker-compose.yml similarity index 94% rename from appstore/weblate/5.13.2.0/docker-compose.yml rename to appstore/weblate/5.13.3.0/docker-compose.yml index 9c5d0735d..85b9987a1 100644 --- a/appstore/weblate/5.13.2.0/docker-compose.yml +++ b/appstore/weblate/5.13.3.0/docker-compose.yml @@ -16,7 +16,7 @@ services: - WEBLATE_ALLOWED_HOSTS=* - POSTGRES_DATABASE=weblate - CLIENT_MAX_BODY_SIZE=200M - image: weblate/weblate:5.13.2.0 + image: weblate/weblate:5.13.3.0 labels: createdBy: Apps networks: diff --git a/appstore/weblate/5.13.2.0/envs/default.env b/appstore/weblate/5.13.3.0/envs/default.env similarity index 100% rename from appstore/weblate/5.13.2.0/envs/default.env rename to appstore/weblate/5.13.3.0/envs/default.env diff --git a/appstore/weblate/5.13.2.0/envs/global.env b/appstore/weblate/5.13.3.0/envs/global.env similarity index 100% rename from appstore/weblate/5.13.2.0/envs/global.env rename to appstore/weblate/5.13.3.0/envs/global.env diff --git a/appstore/weblate/5.13.2.0/scripts/init.sh b/appstore/weblate/5.13.3.0/scripts/init.sh similarity index 100% rename from appstore/weblate/5.13.2.0/scripts/init.sh rename to appstore/weblate/5.13.3.0/scripts/init.sh diff --git a/appstore/weblate/5.13.2.0/scripts/uninstall.sh b/appstore/weblate/5.13.3.0/scripts/uninstall.sh similarity index 100% rename from appstore/weblate/5.13.2.0/scripts/uninstall.sh rename to appstore/weblate/5.13.3.0/scripts/uninstall.sh diff --git a/appstore/weblate/5.13.2.0/scripts/upgrade.sh b/appstore/weblate/5.13.3.0/scripts/upgrade.sh similarity index 100% rename from appstore/weblate/5.13.2.0/scripts/upgrade.sh rename to appstore/weblate/5.13.3.0/scripts/upgrade.sh diff --git a/dockge/astrbot-napcat/docker-compose.yml b/dockge/astrbot-napcat/docker-compose.yml index 8de3aa79c..a74783dd3 100644 --- a/dockge/astrbot-napcat/docker-compose.yml +++ b/dockge/astrbot-napcat/docker-compose.yml @@ -36,7 +36,7 @@ services: - MODE=astrbot - NAPCAT_UID=${NAPCAT_UID:-1000} - NAPCAT_GID=${NAPCAT_GID:-1000} - image: mlikiowa/napcat-docker:v4.8.110 + image: mlikiowa/napcat-docker:v4.8.113 mac_address: ${NAPCAT_MAC_ADDRESS:-02:42:ac:11:00:02} networks: - 1panel-network diff --git a/dockge/nodepassdash/docker-compose.yml b/dockge/nodepassdash/docker-compose.yml index b9a42c35e..a043d19bd 100644 --- a/dockge/nodepassdash/docker-compose.yml +++ b/dockge/nodepassdash/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - PORT=${PANEL_APP_PORT_HTTP} - image: ghcr.io/nodepassproject/nodepassdash:2.2.1 + image: ghcr.io/nodepassproject/nodepassdash:3.0.2 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nodepassdash_3_0_0/.env b/dockge/nodepassdash_2_2_1/.env similarity index 100% rename from dockge/nodepassdash_3_0_0/.env rename to dockge/nodepassdash_2_2_1/.env diff --git a/appstore/nodepassdash/3.0.0/docker-compose.yml b/dockge/nodepassdash_2_2_1/docker-compose.yml similarity index 90% rename from appstore/nodepassdash/3.0.0/docker-compose.yml rename to dockge/nodepassdash_2_2_1/docker-compose.yml index 5dda157df..b9a42c35e 100644 --- a/appstore/nodepassdash/3.0.0/docker-compose.yml +++ b/dockge/nodepassdash_2_2_1/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - PORT=${PANEL_APP_PORT_HTTP} - image: ghcr.io/nodepassproject/nodepassdash:3.0.0 + image: ghcr.io/nodepassproject/nodepassdash:2.2.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nodepassdash_3_0_0/envs/default.env b/dockge/nodepassdash_2_2_1/envs/default.env similarity index 100% rename from dockge/nodepassdash_3_0_0/envs/default.env rename to dockge/nodepassdash_2_2_1/envs/default.env diff --git a/dockge/nodepassdash_3_0_0/envs/global.env b/dockge/nodepassdash_2_2_1/envs/global.env similarity index 100% rename from dockge/nodepassdash_3_0_0/envs/global.env rename to dockge/nodepassdash_2_2_1/envs/global.env diff --git a/dockge/rustdesk-api/.env b/dockge/rustdesk-api/.env index 96a0fb5a5..057e9b006 100644 --- a/dockge/rustdesk-api/.env +++ b/dockge/rustdesk-api/.env @@ -4,7 +4,7 @@ RUSTDESK_API_ROOT_PATH=/home/rustdesk-api # WebUI API 端口 [必填] PANEL_APP_PORT_HTTP=21114 -# NAT 服务端口 [必填] +# NAT 测试服务端口 [必填] PANEL_APP_PORT_NAT=21115 # ID 服务端口 [必填] diff --git a/dockge/rustdesk-api/docker-compose.yml b/dockge/rustdesk-api/docker-compose.yml index 0ca8d2616..aad6a35ef 100644 --- a/dockge/rustdesk-api/docker-compose.yml +++ b/dockge/rustdesk-api/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - rustdesk-api: + rustdesk: container_name: rustdesk-api env_file: - ./envs/global.env @@ -10,33 +10,16 @@ services: environment: - TZ=Asia/Shanghai - RUSTDESK_API_LANG=zh-CN - image: lejianwen/rustdesk-api:v2.6.28 - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:21114 - restart: always - volumes: - - ${RUSTDESK_API_ROOT_PATH}/api-data:/app/data - - ${RUSTDESK_API_ROOT_PATH}/api-config:/app/config - rustdesk-server-s6: - container_name: server-rustdesk-api - env_file: - - ./envs/global.env - - .env - environment: - - TZ=Asia/Shanghai - - RUSTDESK_API_LANG=zh-CN - RELAY=${RUSTDESK_SERVER_URL} - ENCRYPTED_ONLY=1 - image: rustdesk/rustdesk-server-s6:latest + - MUST_LOGIN=N + image: lejianwen/rustdesk-server-s6:latest labels: createdBy: Apps networks: - 1panel-network ports: + - ${PANEL_APP_PORT_HTTP}:21114 - ${PANEL_APP_PORT_NAT}:21115 - ${PANEL_APP_PORT_ID}:21116 - ${PANEL_APP_PORT_ID}:21116/udp @@ -46,5 +29,7 @@ services: restart: always volumes: - ${RUSTDESK_API_ROOT_PATH}/server-data:/data + - ${RUSTDESK_API_ROOT_PATH}/api-data:/app/data + - ${RUSTDESK_API_ROOT_PATH}/api-config:/app/config - ${HBBR_RUN_FILE:-./conf/hbbr/run}:/etc/s6-overlay/s6-rc.d/hbbr/run - ${HBBS_RUN_FILE:-./conf/hbbs/run}:/etc/s6-overlay/s6-rc.d/hbbs/run diff --git a/dockge/rustdesk-api_s6-latest/.env b/dockge/rustdesk-api_2_6_29/.env similarity index 97% rename from dockge/rustdesk-api_s6-latest/.env rename to dockge/rustdesk-api_2_6_29/.env index 057e9b006..96a0fb5a5 100644 --- a/dockge/rustdesk-api_s6-latest/.env +++ b/dockge/rustdesk-api_2_6_29/.env @@ -4,7 +4,7 @@ RUSTDESK_API_ROOT_PATH=/home/rustdesk-api # WebUI API 端口 [必填] PANEL_APP_PORT_HTTP=21114 -# NAT 测试服务端口 [必填] +# NAT 服务端口 [必填] PANEL_APP_PORT_NAT=21115 # ID 服务端口 [必填] diff --git a/dockge/rustdesk-api_s6-latest/conf/hbbr/run b/dockge/rustdesk-api_2_6_29/conf/hbbr/run similarity index 100% rename from dockge/rustdesk-api_s6-latest/conf/hbbr/run rename to dockge/rustdesk-api_2_6_29/conf/hbbr/run diff --git a/dockge/rustdesk-api_s6-latest/conf/hbbs/run b/dockge/rustdesk-api_2_6_29/conf/hbbs/run similarity index 100% rename from dockge/rustdesk-api_s6-latest/conf/hbbs/run rename to dockge/rustdesk-api_2_6_29/conf/hbbs/run diff --git a/dockge/rustdesk-api_s6-latest/docker-compose.yml b/dockge/rustdesk-api_2_6_29/docker-compose.yml similarity index 70% rename from dockge/rustdesk-api_s6-latest/docker-compose.yml rename to dockge/rustdesk-api_2_6_29/docker-compose.yml index aad6a35ef..a532d45e1 100644 --- a/dockge/rustdesk-api_s6-latest/docker-compose.yml +++ b/dockge/rustdesk-api_2_6_29/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - rustdesk: + rustdesk-api: container_name: rustdesk-api env_file: - ./envs/global.env @@ -10,16 +10,33 @@ services: environment: - TZ=Asia/Shanghai - RUSTDESK_API_LANG=zh-CN + image: lejianwen/rustdesk-api:v2.6.29 + labels: + createdBy: Apps + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:21114 + restart: always + volumes: + - ${RUSTDESK_API_ROOT_PATH}/api-data:/app/data + - ${RUSTDESK_API_ROOT_PATH}/api-config:/app/config + rustdesk-server-s6: + container_name: server-rustdesk-api + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + - RUSTDESK_API_LANG=zh-CN - RELAY=${RUSTDESK_SERVER_URL} - ENCRYPTED_ONLY=1 - - MUST_LOGIN=N - image: lejianwen/rustdesk-server-s6:latest + image: rustdesk/rustdesk-server-s6:latest labels: createdBy: Apps networks: - 1panel-network ports: - - ${PANEL_APP_PORT_HTTP}:21114 - ${PANEL_APP_PORT_NAT}:21115 - ${PANEL_APP_PORT_ID}:21116 - ${PANEL_APP_PORT_ID}:21116/udp @@ -29,7 +46,5 @@ services: restart: always volumes: - ${RUSTDESK_API_ROOT_PATH}/server-data:/data - - ${RUSTDESK_API_ROOT_PATH}/api-data:/app/data - - ${RUSTDESK_API_ROOT_PATH}/api-config:/app/config - ${HBBR_RUN_FILE:-./conf/hbbr/run}:/etc/s6-overlay/s6-rc.d/hbbr/run - ${HBBS_RUN_FILE:-./conf/hbbs/run}:/etc/s6-overlay/s6-rc.d/hbbs/run diff --git a/dockge/rustdesk-api_s6-latest/envs/default.env b/dockge/rustdesk-api_2_6_29/envs/default.env similarity index 100% rename from dockge/rustdesk-api_s6-latest/envs/default.env rename to dockge/rustdesk-api_2_6_29/envs/default.env diff --git a/dockge/rustdesk-api_s6-latest/envs/global.env b/dockge/rustdesk-api_2_6_29/envs/global.env similarity index 100% rename from dockge/rustdesk-api_s6-latest/envs/global.env rename to dockge/rustdesk-api_2_6_29/envs/global.env diff --git a/dockge/weblate/docker-compose.yml b/dockge/weblate/docker-compose.yml index 9c5d0735d..85b9987a1 100644 --- a/dockge/weblate/docker-compose.yml +++ b/dockge/weblate/docker-compose.yml @@ -16,7 +16,7 @@ services: - WEBLATE_ALLOWED_HOSTS=* - POSTGRES_DATABASE=weblate - CLIENT_MAX_BODY_SIZE=200M - image: weblate/weblate:5.13.2.0 + image: weblate/weblate:5.13.3.0 labels: createdBy: Apps networks: