diff --git a/apps/ammds-ol8/1.6.20/.env b/apps/ammds-ol8/1.6.21/.env similarity index 100% rename from apps/ammds-ol8/1.6.20/.env rename to apps/ammds-ol8/1.6.21/.env diff --git a/apps/ammds-ol8/1.6.20/data.yml b/apps/ammds-ol8/1.6.21/data.yml similarity index 100% rename from apps/ammds-ol8/1.6.20/data.yml rename to apps/ammds-ol8/1.6.21/data.yml diff --git a/apps/ammds-ol8/1.6.20/docker-compose.yml b/apps/ammds-ol8/1.6.21/docker-compose.yml similarity index 95% rename from apps/ammds-ol8/1.6.20/docker-compose.yml rename to apps/ammds-ol8/1.6.21/docker-compose.yml index 70540bf..6aafec2 100644 --- a/apps/ammds-ol8/1.6.20/docker-compose.yml +++ b/apps/ammds-ol8/1.6.21/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.6.20-ol8 + image: qyg2297248353/ammds:v1.6.21-ol8 labels: createdBy: Apps network_mode: ${NETWORK_MODE:-host} diff --git a/apps/ammds-ol8/1.6.20/envs/default.env b/apps/ammds-ol8/1.6.21/envs/default.env similarity index 100% rename from apps/ammds-ol8/1.6.20/envs/default.env rename to apps/ammds-ol8/1.6.21/envs/default.env diff --git a/apps/ammds-ol8/1.6.20/envs/global.env b/apps/ammds-ol8/1.6.21/envs/global.env similarity index 100% rename from apps/ammds-ol8/1.6.20/envs/global.env rename to apps/ammds-ol8/1.6.21/envs/global.env diff --git a/apps/ammds-ol8/1.6.20/scripts/init.sh b/apps/ammds-ol8/1.6.21/scripts/init.sh similarity index 100% rename from apps/ammds-ol8/1.6.20/scripts/init.sh rename to apps/ammds-ol8/1.6.21/scripts/init.sh diff --git a/apps/ammds-ol8/1.6.20/scripts/uninstall.sh b/apps/ammds-ol8/1.6.21/scripts/uninstall.sh similarity index 100% rename from apps/ammds-ol8/1.6.20/scripts/uninstall.sh rename to apps/ammds-ol8/1.6.21/scripts/uninstall.sh diff --git a/apps/ammds-ol8/1.6.20/scripts/upgrade.sh b/apps/ammds-ol8/1.6.21/scripts/upgrade.sh similarity index 100% rename from apps/ammds-ol8/1.6.20/scripts/upgrade.sh rename to apps/ammds-ol8/1.6.21/scripts/upgrade.sh diff --git a/apps/ammds/1.6.20/.env b/apps/ammds/1.6.21/.env similarity index 100% rename from apps/ammds/1.6.20/.env rename to apps/ammds/1.6.21/.env diff --git a/apps/ammds/1.6.20/data.yml b/apps/ammds/1.6.21/data.yml similarity index 100% rename from apps/ammds/1.6.20/data.yml rename to apps/ammds/1.6.21/data.yml diff --git a/apps/ammds/1.6.20/docker-compose.yml b/apps/ammds/1.6.21/docker-compose.yml similarity index 96% rename from apps/ammds/1.6.20/docker-compose.yml rename to apps/ammds/1.6.21/docker-compose.yml index f4eeb66..decbb34 100644 --- a/apps/ammds/1.6.20/docker-compose.yml +++ b/apps/ammds/1.6.21/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.6.20 + image: qyg2297248353/ammds:v1.6.21 labels: createdBy: Apps network_mode: ${NETWORK_MODE:-host} diff --git a/apps/ammds/1.6.20/envs/default.env b/apps/ammds/1.6.21/envs/default.env similarity index 100% rename from apps/ammds/1.6.20/envs/default.env rename to apps/ammds/1.6.21/envs/default.env diff --git a/apps/ammds/1.6.20/envs/global.env b/apps/ammds/1.6.21/envs/global.env similarity index 100% rename from apps/ammds/1.6.20/envs/global.env rename to apps/ammds/1.6.21/envs/global.env diff --git a/apps/ammds/1.6.20/scripts/init.sh b/apps/ammds/1.6.21/scripts/init.sh similarity index 100% rename from apps/ammds/1.6.20/scripts/init.sh rename to apps/ammds/1.6.21/scripts/init.sh diff --git a/apps/ammds/1.6.20/scripts/uninstall.sh b/apps/ammds/1.6.21/scripts/uninstall.sh similarity index 100% rename from apps/ammds/1.6.20/scripts/uninstall.sh rename to apps/ammds/1.6.21/scripts/uninstall.sh diff --git a/apps/ammds/1.6.20/scripts/upgrade.sh b/apps/ammds/1.6.21/scripts/upgrade.sh similarity index 100% rename from apps/ammds/1.6.20/scripts/upgrade.sh rename to apps/ammds/1.6.21/scripts/upgrade.sh diff --git a/apps/ani-rss/2.0.21/.env b/apps/ani-rss/2.0.22/.env similarity index 100% rename from apps/ani-rss/2.0.21/.env rename to apps/ani-rss/2.0.22/.env diff --git a/apps/ani-rss/2.0.21/data.yml b/apps/ani-rss/2.0.22/data.yml similarity index 100% rename from apps/ani-rss/2.0.21/data.yml rename to apps/ani-rss/2.0.22/data.yml diff --git a/apps/ani-rss/2.0.21/docker-compose.yml b/apps/ani-rss/2.0.22/docker-compose.yml similarity index 95% rename from apps/ani-rss/2.0.21/docker-compose.yml rename to apps/ani-rss/2.0.22/docker-compose.yml index 64f4e3f..075d74f 100644 --- a/apps/ani-rss/2.0.21/docker-compose.yml +++ b/apps/ani-rss/2.0.22/docker-compose.yml @@ -14,7 +14,7 @@ services: - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v2.0.21 + image: wushuo894/ani-rss:v2.0.22 labels: createdBy: Apps networks: diff --git a/apps/ani-rss/2.0.21/envs/default.env b/apps/ani-rss/2.0.22/envs/default.env similarity index 100% rename from apps/ani-rss/2.0.21/envs/default.env rename to apps/ani-rss/2.0.22/envs/default.env diff --git a/apps/ani-rss/2.0.21/envs/global.env b/apps/ani-rss/2.0.22/envs/global.env similarity index 100% rename from apps/ani-rss/2.0.21/envs/global.env rename to apps/ani-rss/2.0.22/envs/global.env diff --git a/apps/ani-rss/2.0.21/scripts/init.sh b/apps/ani-rss/2.0.22/scripts/init.sh similarity index 100% rename from apps/ani-rss/2.0.21/scripts/init.sh rename to apps/ani-rss/2.0.22/scripts/init.sh diff --git a/apps/ani-rss/2.0.21/scripts/uninstall.sh b/apps/ani-rss/2.0.22/scripts/uninstall.sh similarity index 100% rename from apps/ani-rss/2.0.21/scripts/uninstall.sh rename to apps/ani-rss/2.0.22/scripts/uninstall.sh diff --git a/apps/ani-rss/2.0.21/scripts/upgrade.sh b/apps/ani-rss/2.0.22/scripts/upgrade.sh similarity index 100% rename from apps/ani-rss/2.0.21/scripts/upgrade.sh rename to apps/ani-rss/2.0.22/scripts/upgrade.sh diff --git a/apps/casdoor/1.964.0/.env b/apps/casdoor/1.966.0/.env similarity index 100% rename from apps/casdoor/1.964.0/.env rename to apps/casdoor/1.966.0/.env diff --git a/apps/casdoor/1.964.0/config/init_data.json b/apps/casdoor/1.966.0/config/init_data.json similarity index 100% rename from apps/casdoor/1.964.0/config/init_data.json rename to apps/casdoor/1.966.0/config/init_data.json diff --git a/apps/casdoor/1.964.0/data.yml b/apps/casdoor/1.966.0/data.yml similarity index 100% rename from apps/casdoor/1.964.0/data.yml rename to apps/casdoor/1.966.0/data.yml diff --git a/apps/casdoor/1.964.0/docker-compose.yml b/apps/casdoor/1.966.0/docker-compose.yml similarity index 93% rename from apps/casdoor/1.964.0/docker-compose.yml rename to apps/casdoor/1.966.0/docker-compose.yml index 86b620d..cad7fb2 100644 --- a/apps/casdoor/1.964.0/docker-compose.yml +++ b/apps/casdoor/1.966.0/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v1.964.0 + image: casbin/casdoor:v1.966.0 labels: createdBy: Apps networks: diff --git a/apps/casdoor/1.964.0/envs/casdoor.env b/apps/casdoor/1.966.0/envs/casdoor.env similarity index 100% rename from apps/casdoor/1.964.0/envs/casdoor.env rename to apps/casdoor/1.966.0/envs/casdoor.env diff --git a/apps/casdoor/1.964.0/envs/default.env b/apps/casdoor/1.966.0/envs/default.env similarity index 100% rename from apps/casdoor/1.964.0/envs/default.env rename to apps/casdoor/1.966.0/envs/default.env diff --git a/apps/casdoor/1.964.0/envs/global.env b/apps/casdoor/1.966.0/envs/global.env similarity index 100% rename from apps/casdoor/1.964.0/envs/global.env rename to apps/casdoor/1.966.0/envs/global.env diff --git a/apps/casdoor/1.964.0/scripts/init.sh b/apps/casdoor/1.966.0/scripts/init.sh similarity index 100% rename from apps/casdoor/1.964.0/scripts/init.sh rename to apps/casdoor/1.966.0/scripts/init.sh diff --git a/apps/casdoor/1.964.0/scripts/uninstall.sh b/apps/casdoor/1.966.0/scripts/uninstall.sh similarity index 100% rename from apps/casdoor/1.964.0/scripts/uninstall.sh rename to apps/casdoor/1.966.0/scripts/uninstall.sh diff --git a/apps/casdoor/1.964.0/scripts/upgrade.sh b/apps/casdoor/1.966.0/scripts/upgrade.sh similarity index 100% rename from apps/casdoor/1.964.0/scripts/upgrade.sh rename to apps/casdoor/1.966.0/scripts/upgrade.sh diff --git a/apps/elastic-elasticsearch/8.18.2/.env b/apps/elastic-elasticsearch/8.18.3/.env similarity index 100% rename from apps/elastic-elasticsearch/8.18.2/.env rename to apps/elastic-elasticsearch/8.18.3/.env diff --git a/apps/elastic-elasticsearch/8.18.2/data.yml b/apps/elastic-elasticsearch/8.18.3/data.yml similarity index 100% rename from apps/elastic-elasticsearch/8.18.2/data.yml rename to apps/elastic-elasticsearch/8.18.3/data.yml diff --git a/apps/elastic-elasticsearch/8.18.2/docker-compose.yml b/apps/elastic-elasticsearch/8.18.3/docker-compose.yml similarity index 96% rename from apps/elastic-elasticsearch/8.18.2/docker-compose.yml rename to apps/elastic-elasticsearch/8.18.3/docker-compose.yml index f458aae..ad48150 100644 --- a/apps/elastic-elasticsearch/8.18.2/docker-compose.yml +++ b/apps/elastic-elasticsearch/8.18.3/docker-compose.yml @@ -11,7 +11,7 @@ services: - LICENSE=basic - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup - image: elasticsearch:8.18.2 + image: elasticsearch:8.18.3 labels: createdBy: Apps networks: diff --git a/apps/elastic-elasticsearch/8.18.2/envs/default.env b/apps/elastic-elasticsearch/8.18.3/envs/default.env similarity index 100% rename from apps/elastic-elasticsearch/8.18.2/envs/default.env rename to apps/elastic-elasticsearch/8.18.3/envs/default.env diff --git a/apps/elastic-elasticsearch/8.18.2/envs/global.env b/apps/elastic-elasticsearch/8.18.3/envs/global.env similarity index 100% rename from apps/elastic-elasticsearch/8.18.2/envs/global.env rename to apps/elastic-elasticsearch/8.18.3/envs/global.env diff --git a/apps/elastic-elasticsearch/8.18.2/scripts/init.sh b/apps/elastic-elasticsearch/8.18.3/scripts/init.sh similarity index 100% rename from apps/elastic-elasticsearch/8.18.2/scripts/init.sh rename to apps/elastic-elasticsearch/8.18.3/scripts/init.sh diff --git a/apps/elastic-elasticsearch/8.18.2/scripts/uninstall.sh b/apps/elastic-elasticsearch/8.18.3/scripts/uninstall.sh similarity index 100% rename from apps/elastic-elasticsearch/8.18.2/scripts/uninstall.sh rename to apps/elastic-elasticsearch/8.18.3/scripts/uninstall.sh diff --git a/apps/elastic-elasticsearch/8.18.2/scripts/upgrade.sh b/apps/elastic-elasticsearch/8.18.3/scripts/upgrade.sh similarity index 100% rename from apps/elastic-elasticsearch/8.18.2/scripts/upgrade.sh rename to apps/elastic-elasticsearch/8.18.3/scripts/upgrade.sh diff --git a/apps/elastic-elasticsearch/9.0.2/.env b/apps/elastic-elasticsearch/9.0.3/.env similarity index 100% rename from apps/elastic-elasticsearch/9.0.2/.env rename to apps/elastic-elasticsearch/9.0.3/.env diff --git a/apps/elastic-elasticsearch/9.0.2/data.yml b/apps/elastic-elasticsearch/9.0.3/data.yml similarity index 100% rename from apps/elastic-elasticsearch/9.0.2/data.yml rename to apps/elastic-elasticsearch/9.0.3/data.yml diff --git a/apps/elastic-elasticsearch/9.0.2/docker-compose.yml b/apps/elastic-elasticsearch/9.0.3/docker-compose.yml similarity index 96% rename from apps/elastic-elasticsearch/9.0.2/docker-compose.yml rename to apps/elastic-elasticsearch/9.0.3/docker-compose.yml index d9d202a..4c7ede3 100644 --- a/apps/elastic-elasticsearch/9.0.2/docker-compose.yml +++ b/apps/elastic-elasticsearch/9.0.3/docker-compose.yml @@ -11,7 +11,7 @@ services: - LICENSE=basic - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup - image: elasticsearch:9.0.2 + image: elasticsearch:9.0.3 labels: createdBy: Apps networks: diff --git a/apps/elastic-elasticsearch/9.0.2/envs/default.env b/apps/elastic-elasticsearch/9.0.3/envs/default.env similarity index 100% rename from apps/elastic-elasticsearch/9.0.2/envs/default.env rename to apps/elastic-elasticsearch/9.0.3/envs/default.env diff --git a/apps/elastic-elasticsearch/9.0.2/envs/global.env b/apps/elastic-elasticsearch/9.0.3/envs/global.env similarity index 100% rename from apps/elastic-elasticsearch/9.0.2/envs/global.env rename to apps/elastic-elasticsearch/9.0.3/envs/global.env diff --git a/apps/elastic-elasticsearch/9.0.2/scripts/init.sh b/apps/elastic-elasticsearch/9.0.3/scripts/init.sh similarity index 100% rename from apps/elastic-elasticsearch/9.0.2/scripts/init.sh rename to apps/elastic-elasticsearch/9.0.3/scripts/init.sh diff --git a/apps/elastic-elasticsearch/9.0.2/scripts/uninstall.sh b/apps/elastic-elasticsearch/9.0.3/scripts/uninstall.sh similarity index 100% rename from apps/elastic-elasticsearch/9.0.2/scripts/uninstall.sh rename to apps/elastic-elasticsearch/9.0.3/scripts/uninstall.sh diff --git a/apps/elastic-elasticsearch/9.0.2/scripts/upgrade.sh b/apps/elastic-elasticsearch/9.0.3/scripts/upgrade.sh similarity index 100% rename from apps/elastic-elasticsearch/9.0.2/scripts/upgrade.sh rename to apps/elastic-elasticsearch/9.0.3/scripts/upgrade.sh diff --git a/apps/elastic-kibana/8.18.2/.env b/apps/elastic-kibana/8.18.3/.env similarity index 100% rename from apps/elastic-kibana/8.18.2/.env rename to apps/elastic-kibana/8.18.3/.env diff --git a/apps/elastic-kibana/8.18.2/data.yml b/apps/elastic-kibana/8.18.3/data.yml similarity index 100% rename from apps/elastic-kibana/8.18.2/data.yml rename to apps/elastic-kibana/8.18.3/data.yml diff --git a/apps/elastic-kibana/8.18.2/docker-compose.yml b/apps/elastic-kibana/8.18.3/docker-compose.yml similarity index 95% rename from apps/elastic-kibana/8.18.2/docker-compose.yml rename to apps/elastic-kibana/8.18.3/docker-compose.yml index 76989c3..c090766 100644 --- a/apps/elastic-kibana/8.18.2/docker-compose.yml +++ b/apps/elastic-kibana/8.18.3/docker-compose.yml @@ -14,7 +14,7 @@ services: - I18N_LOCALE="zh-CN" - SERVER_SHUTDOWNTIMEOUT="5s" - MONITORING_UI_CONTAINER_ELASTICSEARCH_ENABLED=true - image: kibana:8.18.2 + image: kibana:8.18.3 labels: createdBy: Apps networks: diff --git a/apps/elastic-kibana/8.18.2/envs/default.env b/apps/elastic-kibana/8.18.3/envs/default.env similarity index 100% rename from apps/elastic-kibana/8.18.2/envs/default.env rename to apps/elastic-kibana/8.18.3/envs/default.env diff --git a/apps/elastic-kibana/8.18.2/envs/global.env b/apps/elastic-kibana/8.18.3/envs/global.env similarity index 100% rename from apps/elastic-kibana/8.18.2/envs/global.env rename to apps/elastic-kibana/8.18.3/envs/global.env diff --git a/apps/elastic-kibana/8.18.2/scripts/init.sh b/apps/elastic-kibana/8.18.3/scripts/init.sh similarity index 100% rename from apps/elastic-kibana/8.18.2/scripts/init.sh rename to apps/elastic-kibana/8.18.3/scripts/init.sh diff --git a/apps/elastic-kibana/8.18.2/scripts/uninstall.sh b/apps/elastic-kibana/8.18.3/scripts/uninstall.sh similarity index 100% rename from apps/elastic-kibana/8.18.2/scripts/uninstall.sh rename to apps/elastic-kibana/8.18.3/scripts/uninstall.sh diff --git a/apps/elastic-kibana/8.18.2/scripts/upgrade.sh b/apps/elastic-kibana/8.18.3/scripts/upgrade.sh similarity index 100% rename from apps/elastic-kibana/8.18.2/scripts/upgrade.sh rename to apps/elastic-kibana/8.18.3/scripts/upgrade.sh diff --git a/apps/elastic-kibana/9.0.2/.env b/apps/elastic-kibana/9.0.3/.env similarity index 100% rename from apps/elastic-kibana/9.0.2/.env rename to apps/elastic-kibana/9.0.3/.env diff --git a/apps/elastic-kibana/9.0.2/data.yml b/apps/elastic-kibana/9.0.3/data.yml similarity index 100% rename from apps/elastic-kibana/9.0.2/data.yml rename to apps/elastic-kibana/9.0.3/data.yml diff --git a/apps/elastic-kibana/9.0.2/docker-compose.yml b/apps/elastic-kibana/9.0.3/docker-compose.yml similarity index 95% rename from apps/elastic-kibana/9.0.2/docker-compose.yml rename to apps/elastic-kibana/9.0.3/docker-compose.yml index d030b33..49f2e1c 100644 --- a/apps/elastic-kibana/9.0.2/docker-compose.yml +++ b/apps/elastic-kibana/9.0.3/docker-compose.yml @@ -14,7 +14,7 @@ services: - I18N_LOCALE="zh-CN" - SERVER_SHUTDOWNTIMEOUT="5s" - MONITORING_UI_CONTAINER_ELASTICSEARCH_ENABLED=true - image: kibana:9.0.2 + image: kibana:9.0.3 labels: createdBy: Apps networks: diff --git a/apps/elastic-kibana/9.0.2/envs/default.env b/apps/elastic-kibana/9.0.3/envs/default.env similarity index 100% rename from apps/elastic-kibana/9.0.2/envs/default.env rename to apps/elastic-kibana/9.0.3/envs/default.env diff --git a/apps/elastic-kibana/9.0.2/envs/global.env b/apps/elastic-kibana/9.0.3/envs/global.env similarity index 100% rename from apps/elastic-kibana/9.0.2/envs/global.env rename to apps/elastic-kibana/9.0.3/envs/global.env diff --git a/apps/elastic-kibana/9.0.2/scripts/init.sh b/apps/elastic-kibana/9.0.3/scripts/init.sh similarity index 100% rename from apps/elastic-kibana/9.0.2/scripts/init.sh rename to apps/elastic-kibana/9.0.3/scripts/init.sh diff --git a/apps/elastic-kibana/9.0.2/scripts/uninstall.sh b/apps/elastic-kibana/9.0.3/scripts/uninstall.sh similarity index 100% rename from apps/elastic-kibana/9.0.2/scripts/uninstall.sh rename to apps/elastic-kibana/9.0.3/scripts/uninstall.sh diff --git a/apps/elastic-kibana/9.0.2/scripts/upgrade.sh b/apps/elastic-kibana/9.0.3/scripts/upgrade.sh similarity index 100% rename from apps/elastic-kibana/9.0.2/scripts/upgrade.sh rename to apps/elastic-kibana/9.0.3/scripts/upgrade.sh diff --git a/apps/rustdesk-api/2.6.24/.env b/apps/rustdesk-api/2.6.25/.env similarity index 62% rename from apps/rustdesk-api/2.6.24/.env rename to apps/rustdesk-api/2.6.25/.env index 1944739..5e9e80c 100644 --- a/apps/rustdesk-api/2.6.24/.env +++ b/apps/rustdesk-api/2.6.25/.env @@ -4,8 +4,29 @@ RUSTDESK_API_ROOT_PATH=/home/rustdesk-api # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=21114 -# RustDesk 服务地址 [必填] -RUSTDESK_SERVER_URL=http://127.0.0.1 +# 服务端口 21115 [必填] +PANEL_APP_PORT_SERVER_1=21115 + +# ID 服务端口 [必填] +PANEL_APP_PORT_ID=21116 + +# 中继服务端口 [必填] +PANEL_APP_PORT_SERVER=21117 + +# 服务端口 21118 [必填] +PANEL_APP_PORT_SERVER_2=21118 + +# 服务端口 21119 [必填] +PANEL_APP_PORT_SERVER_3=21119 + +# RustDesk 中级服务地址 [必填] +RUSTDESK_SERVER_URL=http://127.0.0.1:21117 + +# RustDesk ID 服务地址 [必填] +RUSTDESK_API_RUSTDESK_ID_SERVER=http://127.0.0.1:21116 + +# RustDesk API 服务地址 [必填] +RUSTDESK_API_RUSTDESK_API_SERVER=http://127.0.0.1:21114 # 后台页面标题 [必填] RUSTDESK_API_ADMIN_TITLE=RustDesk API Admin diff --git a/apps/rustdesk-api/2.6.24/conf/hbbr/run b/apps/rustdesk-api/2.6.25/conf/hbbr/run similarity index 100% rename from apps/rustdesk-api/2.6.24/conf/hbbr/run rename to apps/rustdesk-api/2.6.25/conf/hbbr/run diff --git a/apps/rustdesk-api/2.6.24/conf/hbbs/run b/apps/rustdesk-api/2.6.25/conf/hbbs/run similarity index 100% rename from apps/rustdesk-api/2.6.24/conf/hbbs/run rename to apps/rustdesk-api/2.6.25/conf/hbbs/run diff --git a/apps/rustdesk-api/2.6.24/data.yml b/apps/rustdesk-api/2.6.25/data.yml similarity index 69% rename from apps/rustdesk-api/2.6.24/data.yml rename to apps/rustdesk-api/2.6.25/data.yml index 5969203..85393a6 100644 --- a/apps/rustdesk-api/2.6.24/data.yml +++ b/apps/rustdesk-api/2.6.25/data.yml @@ -15,11 +15,65 @@ additionalProperties: required: true rule: paramPort type: number - - default: "http://127.0.0.1" + - default: 21115 + edit: true + envKey: PANEL_APP_PORT_SERVER_1 + labelZh: 服务端口 21115 + labelEn: 服务端口 21115 + required: true + rule: paramPort + type: number + - default: 21116 + edit: true + envKey: PANEL_APP_PORT_ID + labelZh: ID 服务端口 + labelEn: ID Server Port + required: true + rule: paramPort + type: number + - default: 21117 + edit: true + envKey: PANEL_APP_PORT_SERVER + labelZh: 中继服务端口 + labelEn: Intermediate Service Port + required: true + rule: paramPort + type: number + - default: 21118 + edit: true + envKey: PANEL_APP_PORT_SERVER_2 + labelZh: 服务端口 21118 + labelEn: Server Port 21118 + required: true + rule: paramPort + type: number + - default: 21119 + edit: true + envKey: PANEL_APP_PORT_SERVER_3 + labelZh: 服务端口 21119 + labelEn: Server Port 21119 + required: true + rule: paramPort + type: number + - default: "http://127.0.0.1:21117" edit: true envKey: RUSTDESK_SERVER_URL - labelZh: RustDesk 服务地址 - labelEn: RustDesk server address + labelZh: RustDesk 中级服务地址 + labelEn: RustDesk Intermediate service address + required: true + type: text + - default: "http://127.0.0.1:21116" + edit: true + envKey: RUSTDESK_API_RUSTDESK_ID_SERVER + labelZh: RustDesk ID 服务地址 + labelEn: RustDesk ID server address + required: true + type: text + - default: "http://127.0.0.1:21114" + edit: true + envKey: RUSTDESK_API_RUSTDESK_API_SERVER + labelZh: RustDesk API 服务地址 + labelEn: RustDesk API server address required: true type: text - default: "RustDesk API Admin" @@ -121,7 +175,7 @@ additionalProperties: - label: sqlite value: "sqlite" - label: MySQL - value: "false" + value: "mysql" - default: "127.0.0.1:3306" edit: true envKey: RUSTDESK_API_MYSQL_ADDR diff --git a/apps/rustdesk-api/2.6.24/docker-compose.yml b/apps/rustdesk-api/2.6.25/docker-compose.yml similarity index 60% rename from apps/rustdesk-api/2.6.24/docker-compose.yml rename to apps/rustdesk-api/2.6.25/docker-compose.yml index 34d4ae7..490a9d7 100644 --- a/apps/rustdesk-api/2.6.24/docker-compose.yml +++ b/apps/rustdesk-api/2.6.25/docker-compose.yml @@ -10,11 +10,7 @@ services: environment: - TZ=Asia/Shanghai - RUSTDESK_API_LANG=zh-CN - - RUSTDESK_API_RUSTDESK_ID_SERVER=${RUSTDESK_SERVER_URL}:21116 - - RUSTDESK_API_RUSTDESK_RELAY_SERVER=${RUSTDESK_SERVER_URL}:21117 - - RUSTDESK_API_RUSTDESK_API_SERVER=${RUSTDESK_SERVER_URL}:${PANEL_APP_PORT_HTTP:-21114} - - RUSTDESK_API_RUSTDESK_KEY=${KEY} - image: lejianwen/rustdesk-api:v2.6.24 + image: lejianwen/rustdesk-api:v2.6.25 labels: createdBy: Apps networks: @@ -23,7 +19,7 @@ services: - ${PANEL_APP_PORT_HTTP}:21114 restart: always volumes: - - ${RUSTDESK_API_ROOT_PATH}/data:/data + - ${RUSTDESK_API_ROOT_PATH}/api-data:/app/data rustdesk-server-s6: container_name: server-rustdesk-api env_file: @@ -32,23 +28,22 @@ services: environment: - TZ=Asia/Shanghai - RUSTDESK_API_LANG=zh-CN - - RELAY=${RUSTDESK_SERVER_URL}:21117 + - RELAY=${RUSTDESK_SERVER_URL} - ENCRYPTED_ONLY=1 - - RUSTDESK_API_RUSTDESK_KEY=${KEY} image: rustdesk/rustdesk-server-s6:latest labels: createdBy: Apps networks: - 1panel-network ports: - - 21115:21115 - - 21116:21116 - - 21116:21116/udp - - 21117:21117 - - 21118:21118 - - 21119:21119 + - ${PANEL_APP_PORT_SERVER_1}:21115 + - ${PANEL_APP_PORT_ID}:21116 + - ${PANEL_APP_PORT_ID}:21116/udp + - ${PANEL_APP_PORT_SERVER}:21117 + - ${PANEL_APP_PORT_SERVER_2}:21118 + - ${PANEL_APP_PORT_SERVER_3}:21119 restart: always volumes: - - ${RUSTDESK_API_ROOT_PATH}/data:/data + - ${RUSTDESK_API_ROOT_PATH}/server-data:/data - ${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/apps/rustdesk-api/2.6.24/envs/default.env b/apps/rustdesk-api/2.6.25/envs/default.env similarity index 100% rename from apps/rustdesk-api/2.6.24/envs/default.env rename to apps/rustdesk-api/2.6.25/envs/default.env diff --git a/apps/rustdesk-api/2.6.24/envs/global.env b/apps/rustdesk-api/2.6.25/envs/global.env similarity index 100% rename from apps/rustdesk-api/2.6.24/envs/global.env rename to apps/rustdesk-api/2.6.25/envs/global.env diff --git a/apps/rustdesk-api/2.6.24/scripts/init.sh b/apps/rustdesk-api/2.6.25/scripts/init.sh similarity index 100% rename from apps/rustdesk-api/2.6.24/scripts/init.sh rename to apps/rustdesk-api/2.6.25/scripts/init.sh diff --git a/apps/rustdesk-api/2.6.24/scripts/uninstall.sh b/apps/rustdesk-api/2.6.25/scripts/uninstall.sh similarity index 100% rename from apps/rustdesk-api/2.6.24/scripts/uninstall.sh rename to apps/rustdesk-api/2.6.25/scripts/uninstall.sh diff --git a/apps/rustdesk-api/2.6.24/scripts/upgrade.sh b/apps/rustdesk-api/2.6.25/scripts/upgrade.sh similarity index 100% rename from apps/rustdesk-api/2.6.24/scripts/upgrade.sh rename to apps/rustdesk-api/2.6.25/scripts/upgrade.sh diff --git a/apps/slink/1.5.1/.env b/apps/slink/1.6.0/.env similarity index 100% rename from apps/slink/1.5.1/.env rename to apps/slink/1.6.0/.env diff --git a/apps/slink/1.5.1/data.yml b/apps/slink/1.6.0/data.yml similarity index 100% rename from apps/slink/1.5.1/data.yml rename to apps/slink/1.6.0/data.yml diff --git a/apps/slink/1.5.1/docker-compose.yml b/apps/slink/1.6.0/docker-compose.yml similarity index 94% rename from apps/slink/1.5.1/docker-compose.yml rename to apps/slink/1.6.0/docker-compose.yml index a3773d1..3818d06 100644 --- a/apps/slink/1.5.1/docker-compose.yml +++ b/apps/slink/1.6.0/docker-compose.yml @@ -12,7 +12,7 @@ services: - USER_PASSWORD_REQUIREMENTS=15 - IMAGE_MAX_SIZE=15M - STORAGE_PROVIDER=local - image: anirdev/slink:v1.5.1 + image: anirdev/slink:v1.6.0 labels: createdBy: Apps networks: diff --git a/apps/slink/1.5.1/envs/default.env b/apps/slink/1.6.0/envs/default.env similarity index 100% rename from apps/slink/1.5.1/envs/default.env rename to apps/slink/1.6.0/envs/default.env diff --git a/apps/slink/1.5.1/envs/global.env b/apps/slink/1.6.0/envs/global.env similarity index 100% rename from apps/slink/1.5.1/envs/global.env rename to apps/slink/1.6.0/envs/global.env diff --git a/apps/slink/1.5.1/scripts/init.sh b/apps/slink/1.6.0/scripts/init.sh similarity index 100% rename from apps/slink/1.5.1/scripts/init.sh rename to apps/slink/1.6.0/scripts/init.sh diff --git a/apps/slink/1.5.1/scripts/uninstall.sh b/apps/slink/1.6.0/scripts/uninstall.sh similarity index 100% rename from apps/slink/1.5.1/scripts/uninstall.sh rename to apps/slink/1.6.0/scripts/uninstall.sh diff --git a/apps/slink/1.5.1/scripts/upgrade.sh b/apps/slink/1.6.0/scripts/upgrade.sh similarity index 100% rename from apps/slink/1.5.1/scripts/upgrade.sh rename to apps/slink/1.6.0/scripts/upgrade.sh