From 0fbbfdf094d30ac55a8ab6ebd9b4c97674d11b48 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Fri, 11 Jul 2025 03:58:45 +0000 Subject: [PATCH] Processed apps directory via GitHub Actions --- appstore/ammds-ol8/{1.6.20 => 1.6.21}/.env | 0 .../ammds-ol8/{1.6.20 => 1.6.21}/data.yml | 0 .../{1.6.20 => 1.6.21}/docker-compose.yml | 2 +- .../{1.6.20 => 1.6.21}/envs/default.env | 0 .../{1.6.20 => 1.6.21}/envs/global.env | 0 .../{1.6.20 => 1.6.21}/scripts/init.sh | 0 .../{1.6.20 => 1.6.21}/scripts/uninstall.sh | 0 .../{1.6.20 => 1.6.21}/scripts/upgrade.sh | 0 appstore/ammds/{1.6.20 => 1.6.21}/.env | 0 appstore/ammds/{1.6.20 => 1.6.21}/data.yml | 0 .../{1.6.20 => 1.6.21}/docker-compose.yml | 2 +- .../ammds/{1.6.20 => 1.6.21}/envs/default.env | 0 .../ammds/{1.6.20 => 1.6.21}/envs/global.env | 0 .../ammds/{1.6.20 => 1.6.21}/scripts/init.sh | 0 .../{1.6.20 => 1.6.21}/scripts/uninstall.sh | 0 .../{1.6.20 => 1.6.21}/scripts/upgrade.sh | 0 appstore/ani-rss/{2.0.21 => 2.0.22}/.env | 0 appstore/ani-rss/{2.0.21 => 2.0.22}/data.yml | 0 .../{2.0.21 => 2.0.22}/docker-compose.yml | 2 +- .../{2.0.21 => 2.0.22}/envs/default.env | 0 .../{2.0.21 => 2.0.22}/envs/global.env | 0 .../{2.0.21 => 2.0.22}/scripts/init.sh | 0 .../{2.0.21 => 2.0.22}/scripts/uninstall.sh | 0 .../{2.0.21 => 2.0.22}/scripts/upgrade.sh | 0 appstore/casdoor/{1.964.0 => 1.966.0}/.env | 0 .../config/init_data.json | 0 .../casdoor/{1.964.0 => 1.966.0}/data.yml | 0 .../{1.964.0 => 1.966.0}/docker-compose.yml | 2 +- .../{1.964.0 => 1.966.0}/envs/casdoor.env | 0 .../{1.964.0 => 1.966.0}/envs/default.env | 0 .../{1.964.0 => 1.966.0}/envs/global.env | 0 .../{1.964.0 => 1.966.0}/scripts/init.sh | 0 .../{1.964.0 => 1.966.0}/scripts/uninstall.sh | 0 .../{1.964.0 => 1.966.0}/scripts/upgrade.sh | 0 .../{8.18.2 => 8.18.3}/.env | 0 .../{8.18.2 => 8.18.3}/data.yml | 0 .../{8.18.2 => 8.18.3}/docker-compose.yml | 2 +- .../{8.18.2 => 8.18.3}/envs/default.env | 0 .../{8.18.2 => 8.18.3}/envs/global.env | 0 .../{8.18.2 => 8.18.3}/scripts/init.sh | 0 .../{8.18.2 => 8.18.3}/scripts/uninstall.sh | 0 .../{8.18.2 => 8.18.3}/scripts/upgrade.sh | 0 .../{9.0.2 => 9.0.3}/.env | 0 .../{9.0.2 => 9.0.3}/data.yml | 0 .../{9.0.2 => 9.0.3}/docker-compose.yml | 2 +- .../{9.0.2 => 9.0.3}/envs/default.env | 0 .../{9.0.2 => 9.0.3}/envs/global.env | 0 .../{9.0.2 => 9.0.3}/scripts/init.sh | 0 .../{9.0.2 => 9.0.3}/scripts/uninstall.sh | 0 .../{9.0.2 => 9.0.3}/scripts/upgrade.sh | 0 .../elastic-kibana/{8.18.2 => 8.18.3}/.env | 0 .../{8.18.2 => 8.18.3}/data.yml | 0 .../elastic-kibana/8.18.3}/docker-compose.yml | 2 +- .../{8.18.2 => 8.18.3}/envs/default.env | 0 .../{8.18.2 => 8.18.3}/envs/global.env | 0 .../{8.18.2 => 8.18.3}/scripts/init.sh | 0 .../{8.18.2 => 8.18.3}/scripts/uninstall.sh | 0 .../{8.18.2 => 8.18.3}/scripts/upgrade.sh | 0 appstore/elastic-kibana/{9.0.2 => 9.0.3}/.env | 0 .../elastic-kibana/{9.0.2 => 9.0.3}/data.yml | 0 .../{9.0.2 => 9.0.3}/docker-compose.yml | 2 +- .../{9.0.2 => 9.0.3}/envs/default.env | 0 .../{9.0.2 => 9.0.3}/envs/global.env | 0 .../{9.0.2 => 9.0.3}/scripts/init.sh | 0 .../{9.0.2 => 9.0.3}/scripts/uninstall.sh | 0 .../{9.0.2 => 9.0.3}/scripts/upgrade.sh | 0 appstore/rustdesk-api/{2.6.24 => 2.6.25}/.env | 25 +++++++- .../{2.6.24 => 2.6.25}/conf/hbbr/run | 0 .../{2.6.24 => 2.6.25}/conf/hbbs/run | 0 .../rustdesk-api/{2.6.24 => 2.6.25}/data.yml | 62 +++++++++++++++++-- .../{2.6.24 => 2.6.25}/docker-compose.yml | 25 +++----- .../{2.6.24 => 2.6.25}/envs/default.env | 0 .../{2.6.24 => 2.6.25}/envs/global.env | 0 .../{2.6.24 => 2.6.25}/scripts/init.sh | 0 .../{2.6.24 => 2.6.25}/scripts/uninstall.sh | 0 .../{2.6.24 => 2.6.25}/scripts/upgrade.sh | 0 appstore/slink/{1.5.1 => 1.6.0}/.env | 0 appstore/slink/{1.5.1 => 1.6.0}/data.yml | 0 .../slink/{1.5.1 => 1.6.0}/docker-compose.yml | 2 +- .../slink/{1.5.1 => 1.6.0}/envs/default.env | 0 .../slink/{1.5.1 => 1.6.0}/envs/global.env | 0 .../slink/{1.5.1 => 1.6.0}/scripts/init.sh | 0 .../{1.5.1 => 1.6.0}/scripts/uninstall.sh | 0 .../slink/{1.5.1 => 1.6.0}/scripts/upgrade.sh | 0 dockge/ammds-ol8/docker-compose.yml | 2 +- dockge/ammds/docker-compose.yml | 2 +- dockge/ani-rss/docker-compose.yml | 5 +- .../{ani-rss_2_0_21 => ani-rss_1_2_82}/.env | 0 .../docker-compose.yml | 5 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/casdoor/docker-compose.yml | 2 +- .../elastic-elasticsearch/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/elastic-kibana/docker-compose.yml | 2 +- .../.env | 0 .../elastic-kibana_8_18_3}/docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/rustdesk-api/.env | 25 +++++++- dockge/rustdesk-api/docker-compose.yml | 25 +++----- dockge/slink/docker-compose.yml | 2 +- 105 files changed, 146 insertions(+), 60 deletions(-) rename appstore/ammds-ol8/{1.6.20 => 1.6.21}/.env (100%) rename appstore/ammds-ol8/{1.6.20 => 1.6.21}/data.yml (100%) rename appstore/ammds-ol8/{1.6.20 => 1.6.21}/docker-compose.yml (95%) rename appstore/ammds-ol8/{1.6.20 => 1.6.21}/envs/default.env (100%) rename appstore/ammds-ol8/{1.6.20 => 1.6.21}/envs/global.env (100%) rename appstore/ammds-ol8/{1.6.20 => 1.6.21}/scripts/init.sh (100%) rename appstore/ammds-ol8/{1.6.20 => 1.6.21}/scripts/uninstall.sh (100%) rename appstore/ammds-ol8/{1.6.20 => 1.6.21}/scripts/upgrade.sh (100%) rename appstore/ammds/{1.6.20 => 1.6.21}/.env (100%) rename appstore/ammds/{1.6.20 => 1.6.21}/data.yml (100%) rename appstore/ammds/{1.6.20 => 1.6.21}/docker-compose.yml (96%) rename appstore/ammds/{1.6.20 => 1.6.21}/envs/default.env (100%) rename appstore/ammds/{1.6.20 => 1.6.21}/envs/global.env (100%) rename appstore/ammds/{1.6.20 => 1.6.21}/scripts/init.sh (100%) rename appstore/ammds/{1.6.20 => 1.6.21}/scripts/uninstall.sh (100%) rename appstore/ammds/{1.6.20 => 1.6.21}/scripts/upgrade.sh (100%) rename appstore/ani-rss/{2.0.21 => 2.0.22}/.env (100%) rename appstore/ani-rss/{2.0.21 => 2.0.22}/data.yml (100%) rename appstore/ani-rss/{2.0.21 => 2.0.22}/docker-compose.yml (95%) rename appstore/ani-rss/{2.0.21 => 2.0.22}/envs/default.env (100%) rename appstore/ani-rss/{2.0.21 => 2.0.22}/envs/global.env (100%) rename appstore/ani-rss/{2.0.21 => 2.0.22}/scripts/init.sh (100%) rename appstore/ani-rss/{2.0.21 => 2.0.22}/scripts/uninstall.sh (100%) rename appstore/ani-rss/{2.0.21 => 2.0.22}/scripts/upgrade.sh (100%) rename appstore/casdoor/{1.964.0 => 1.966.0}/.env (100%) rename appstore/casdoor/{1.964.0 => 1.966.0}/config/init_data.json (100%) rename appstore/casdoor/{1.964.0 => 1.966.0}/data.yml (100%) rename appstore/casdoor/{1.964.0 => 1.966.0}/docker-compose.yml (93%) rename appstore/casdoor/{1.964.0 => 1.966.0}/envs/casdoor.env (100%) rename appstore/casdoor/{1.964.0 => 1.966.0}/envs/default.env (100%) rename appstore/casdoor/{1.964.0 => 1.966.0}/envs/global.env (100%) rename appstore/casdoor/{1.964.0 => 1.966.0}/scripts/init.sh (100%) rename appstore/casdoor/{1.964.0 => 1.966.0}/scripts/uninstall.sh (100%) rename appstore/casdoor/{1.964.0 => 1.966.0}/scripts/upgrade.sh (100%) rename appstore/elastic-elasticsearch/{8.18.2 => 8.18.3}/.env (100%) rename appstore/elastic-elasticsearch/{8.18.2 => 8.18.3}/data.yml (100%) rename appstore/elastic-elasticsearch/{8.18.2 => 8.18.3}/docker-compose.yml (96%) rename appstore/elastic-elasticsearch/{8.18.2 => 8.18.3}/envs/default.env (100%) rename appstore/elastic-elasticsearch/{8.18.2 => 8.18.3}/envs/global.env (100%) rename appstore/elastic-elasticsearch/{8.18.2 => 8.18.3}/scripts/init.sh (100%) rename appstore/elastic-elasticsearch/{8.18.2 => 8.18.3}/scripts/uninstall.sh (100%) rename appstore/elastic-elasticsearch/{8.18.2 => 8.18.3}/scripts/upgrade.sh (100%) rename appstore/elastic-elasticsearch/{9.0.2 => 9.0.3}/.env (100%) rename appstore/elastic-elasticsearch/{9.0.2 => 9.0.3}/data.yml (100%) rename appstore/elastic-elasticsearch/{9.0.2 => 9.0.3}/docker-compose.yml (96%) rename appstore/elastic-elasticsearch/{9.0.2 => 9.0.3}/envs/default.env (100%) rename appstore/elastic-elasticsearch/{9.0.2 => 9.0.3}/envs/global.env (100%) rename appstore/elastic-elasticsearch/{9.0.2 => 9.0.3}/scripts/init.sh (100%) rename appstore/elastic-elasticsearch/{9.0.2 => 9.0.3}/scripts/uninstall.sh (100%) rename appstore/elastic-elasticsearch/{9.0.2 => 9.0.3}/scripts/upgrade.sh (100%) rename appstore/elastic-kibana/{8.18.2 => 8.18.3}/.env (100%) rename appstore/elastic-kibana/{8.18.2 => 8.18.3}/data.yml (100%) rename {dockge/elastic-kibana_9_0_2 => appstore/elastic-kibana/8.18.3}/docker-compose.yml (95%) rename appstore/elastic-kibana/{8.18.2 => 8.18.3}/envs/default.env (100%) rename appstore/elastic-kibana/{8.18.2 => 8.18.3}/envs/global.env (100%) rename appstore/elastic-kibana/{8.18.2 => 8.18.3}/scripts/init.sh (100%) rename appstore/elastic-kibana/{8.18.2 => 8.18.3}/scripts/uninstall.sh (100%) rename appstore/elastic-kibana/{8.18.2 => 8.18.3}/scripts/upgrade.sh (100%) rename appstore/elastic-kibana/{9.0.2 => 9.0.3}/.env (100%) rename appstore/elastic-kibana/{9.0.2 => 9.0.3}/data.yml (100%) rename appstore/elastic-kibana/{9.0.2 => 9.0.3}/docker-compose.yml (95%) rename appstore/elastic-kibana/{9.0.2 => 9.0.3}/envs/default.env (100%) rename appstore/elastic-kibana/{9.0.2 => 9.0.3}/envs/global.env (100%) rename appstore/elastic-kibana/{9.0.2 => 9.0.3}/scripts/init.sh (100%) rename appstore/elastic-kibana/{9.0.2 => 9.0.3}/scripts/uninstall.sh (100%) rename appstore/elastic-kibana/{9.0.2 => 9.0.3}/scripts/upgrade.sh (100%) rename appstore/rustdesk-api/{2.6.24 => 2.6.25}/.env (62%) rename appstore/rustdesk-api/{2.6.24 => 2.6.25}/conf/hbbr/run (100%) rename appstore/rustdesk-api/{2.6.24 => 2.6.25}/conf/hbbs/run (100%) rename appstore/rustdesk-api/{2.6.24 => 2.6.25}/data.yml (69%) rename appstore/rustdesk-api/{2.6.24 => 2.6.25}/docker-compose.yml (60%) rename appstore/rustdesk-api/{2.6.24 => 2.6.25}/envs/default.env (100%) rename appstore/rustdesk-api/{2.6.24 => 2.6.25}/envs/global.env (100%) rename appstore/rustdesk-api/{2.6.24 => 2.6.25}/scripts/init.sh (100%) rename appstore/rustdesk-api/{2.6.24 => 2.6.25}/scripts/uninstall.sh (100%) rename appstore/rustdesk-api/{2.6.24 => 2.6.25}/scripts/upgrade.sh (100%) rename appstore/slink/{1.5.1 => 1.6.0}/.env (100%) rename appstore/slink/{1.5.1 => 1.6.0}/data.yml (100%) rename appstore/slink/{1.5.1 => 1.6.0}/docker-compose.yml (94%) rename appstore/slink/{1.5.1 => 1.6.0}/envs/default.env (100%) rename appstore/slink/{1.5.1 => 1.6.0}/envs/global.env (100%) rename appstore/slink/{1.5.1 => 1.6.0}/scripts/init.sh (100%) rename appstore/slink/{1.5.1 => 1.6.0}/scripts/uninstall.sh (100%) rename appstore/slink/{1.5.1 => 1.6.0}/scripts/upgrade.sh (100%) rename dockge/{ani-rss_2_0_21 => ani-rss_1_2_82}/.env (100%) rename dockge/{ani-rss_2_0_21 => ani-rss_1_2_82}/docker-compose.yml (90%) rename dockge/{ani-rss_2_0_21 => ani-rss_1_2_82}/envs/default.env (100%) rename dockge/{ani-rss_2_0_21 => ani-rss_1_2_82}/envs/global.env (100%) rename dockge/{elastic-elasticsearch_9_0_2 => elastic-elasticsearch_8_18_3}/.env (100%) rename dockge/{elastic-elasticsearch_9_0_2 => elastic-elasticsearch_8_18_3}/docker-compose.yml (96%) rename dockge/{elastic-elasticsearch_9_0_2 => elastic-elasticsearch_8_18_3}/envs/default.env (100%) rename dockge/{elastic-elasticsearch_9_0_2 => elastic-elasticsearch_8_18_3}/envs/global.env (100%) rename dockge/{elastic-kibana_9_0_2 => elastic-kibana_8_18_3}/.env (100%) rename {appstore/elastic-kibana/8.18.2 => dockge/elastic-kibana_8_18_3}/docker-compose.yml (95%) rename dockge/{elastic-kibana_9_0_2 => elastic-kibana_8_18_3}/envs/default.env (100%) rename dockge/{elastic-kibana_9_0_2 => elastic-kibana_8_18_3}/envs/global.env (100%) diff --git a/appstore/ammds-ol8/1.6.20/.env b/appstore/ammds-ol8/1.6.21/.env similarity index 100% rename from appstore/ammds-ol8/1.6.20/.env rename to appstore/ammds-ol8/1.6.21/.env diff --git a/appstore/ammds-ol8/1.6.20/data.yml b/appstore/ammds-ol8/1.6.21/data.yml similarity index 100% rename from appstore/ammds-ol8/1.6.20/data.yml rename to appstore/ammds-ol8/1.6.21/data.yml diff --git a/appstore/ammds-ol8/1.6.20/docker-compose.yml b/appstore/ammds-ol8/1.6.21/docker-compose.yml similarity index 95% rename from appstore/ammds-ol8/1.6.20/docker-compose.yml rename to appstore/ammds-ol8/1.6.21/docker-compose.yml index 70540bfca..6aafec247 100644 --- a/appstore/ammds-ol8/1.6.20/docker-compose.yml +++ b/appstore/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/appstore/ammds-ol8/1.6.20/envs/default.env b/appstore/ammds-ol8/1.6.21/envs/default.env similarity index 100% rename from appstore/ammds-ol8/1.6.20/envs/default.env rename to appstore/ammds-ol8/1.6.21/envs/default.env diff --git a/appstore/ammds-ol8/1.6.20/envs/global.env b/appstore/ammds-ol8/1.6.21/envs/global.env similarity index 100% rename from appstore/ammds-ol8/1.6.20/envs/global.env rename to appstore/ammds-ol8/1.6.21/envs/global.env diff --git a/appstore/ammds-ol8/1.6.20/scripts/init.sh b/appstore/ammds-ol8/1.6.21/scripts/init.sh similarity index 100% rename from appstore/ammds-ol8/1.6.20/scripts/init.sh rename to appstore/ammds-ol8/1.6.21/scripts/init.sh diff --git a/appstore/ammds-ol8/1.6.20/scripts/uninstall.sh b/appstore/ammds-ol8/1.6.21/scripts/uninstall.sh similarity index 100% rename from appstore/ammds-ol8/1.6.20/scripts/uninstall.sh rename to appstore/ammds-ol8/1.6.21/scripts/uninstall.sh diff --git a/appstore/ammds-ol8/1.6.20/scripts/upgrade.sh b/appstore/ammds-ol8/1.6.21/scripts/upgrade.sh similarity index 100% rename from appstore/ammds-ol8/1.6.20/scripts/upgrade.sh rename to appstore/ammds-ol8/1.6.21/scripts/upgrade.sh diff --git a/appstore/ammds/1.6.20/.env b/appstore/ammds/1.6.21/.env similarity index 100% rename from appstore/ammds/1.6.20/.env rename to appstore/ammds/1.6.21/.env diff --git a/appstore/ammds/1.6.20/data.yml b/appstore/ammds/1.6.21/data.yml similarity index 100% rename from appstore/ammds/1.6.20/data.yml rename to appstore/ammds/1.6.21/data.yml diff --git a/appstore/ammds/1.6.20/docker-compose.yml b/appstore/ammds/1.6.21/docker-compose.yml similarity index 96% rename from appstore/ammds/1.6.20/docker-compose.yml rename to appstore/ammds/1.6.21/docker-compose.yml index f4eeb664c..decbb34c9 100644 --- a/appstore/ammds/1.6.20/docker-compose.yml +++ b/appstore/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/appstore/ammds/1.6.20/envs/default.env b/appstore/ammds/1.6.21/envs/default.env similarity index 100% rename from appstore/ammds/1.6.20/envs/default.env rename to appstore/ammds/1.6.21/envs/default.env diff --git a/appstore/ammds/1.6.20/envs/global.env b/appstore/ammds/1.6.21/envs/global.env similarity index 100% rename from appstore/ammds/1.6.20/envs/global.env rename to appstore/ammds/1.6.21/envs/global.env diff --git a/appstore/ammds/1.6.20/scripts/init.sh b/appstore/ammds/1.6.21/scripts/init.sh similarity index 100% rename from appstore/ammds/1.6.20/scripts/init.sh rename to appstore/ammds/1.6.21/scripts/init.sh diff --git a/appstore/ammds/1.6.20/scripts/uninstall.sh b/appstore/ammds/1.6.21/scripts/uninstall.sh similarity index 100% rename from appstore/ammds/1.6.20/scripts/uninstall.sh rename to appstore/ammds/1.6.21/scripts/uninstall.sh diff --git a/appstore/ammds/1.6.20/scripts/upgrade.sh b/appstore/ammds/1.6.21/scripts/upgrade.sh similarity index 100% rename from appstore/ammds/1.6.20/scripts/upgrade.sh rename to appstore/ammds/1.6.21/scripts/upgrade.sh diff --git a/appstore/ani-rss/2.0.21/.env b/appstore/ani-rss/2.0.22/.env similarity index 100% rename from appstore/ani-rss/2.0.21/.env rename to appstore/ani-rss/2.0.22/.env diff --git a/appstore/ani-rss/2.0.21/data.yml b/appstore/ani-rss/2.0.22/data.yml similarity index 100% rename from appstore/ani-rss/2.0.21/data.yml rename to appstore/ani-rss/2.0.22/data.yml diff --git a/appstore/ani-rss/2.0.21/docker-compose.yml b/appstore/ani-rss/2.0.22/docker-compose.yml similarity index 95% rename from appstore/ani-rss/2.0.21/docker-compose.yml rename to appstore/ani-rss/2.0.22/docker-compose.yml index 64f4e3f4c..075d74ff7 100644 --- a/appstore/ani-rss/2.0.21/docker-compose.yml +++ b/appstore/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/appstore/ani-rss/2.0.21/envs/default.env b/appstore/ani-rss/2.0.22/envs/default.env similarity index 100% rename from appstore/ani-rss/2.0.21/envs/default.env rename to appstore/ani-rss/2.0.22/envs/default.env diff --git a/appstore/ani-rss/2.0.21/envs/global.env b/appstore/ani-rss/2.0.22/envs/global.env similarity index 100% rename from appstore/ani-rss/2.0.21/envs/global.env rename to appstore/ani-rss/2.0.22/envs/global.env diff --git a/appstore/ani-rss/2.0.21/scripts/init.sh b/appstore/ani-rss/2.0.22/scripts/init.sh similarity index 100% rename from appstore/ani-rss/2.0.21/scripts/init.sh rename to appstore/ani-rss/2.0.22/scripts/init.sh diff --git a/appstore/ani-rss/2.0.21/scripts/uninstall.sh b/appstore/ani-rss/2.0.22/scripts/uninstall.sh similarity index 100% rename from appstore/ani-rss/2.0.21/scripts/uninstall.sh rename to appstore/ani-rss/2.0.22/scripts/uninstall.sh diff --git a/appstore/ani-rss/2.0.21/scripts/upgrade.sh b/appstore/ani-rss/2.0.22/scripts/upgrade.sh similarity index 100% rename from appstore/ani-rss/2.0.21/scripts/upgrade.sh rename to appstore/ani-rss/2.0.22/scripts/upgrade.sh diff --git a/appstore/casdoor/1.964.0/.env b/appstore/casdoor/1.966.0/.env similarity index 100% rename from appstore/casdoor/1.964.0/.env rename to appstore/casdoor/1.966.0/.env diff --git a/appstore/casdoor/1.964.0/config/init_data.json b/appstore/casdoor/1.966.0/config/init_data.json similarity index 100% rename from appstore/casdoor/1.964.0/config/init_data.json rename to appstore/casdoor/1.966.0/config/init_data.json diff --git a/appstore/casdoor/1.964.0/data.yml b/appstore/casdoor/1.966.0/data.yml similarity index 100% rename from appstore/casdoor/1.964.0/data.yml rename to appstore/casdoor/1.966.0/data.yml diff --git a/appstore/casdoor/1.964.0/docker-compose.yml b/appstore/casdoor/1.966.0/docker-compose.yml similarity index 93% rename from appstore/casdoor/1.964.0/docker-compose.yml rename to appstore/casdoor/1.966.0/docker-compose.yml index 86b620dcb..cad7fb219 100644 --- a/appstore/casdoor/1.964.0/docker-compose.yml +++ b/appstore/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/appstore/casdoor/1.964.0/envs/casdoor.env b/appstore/casdoor/1.966.0/envs/casdoor.env similarity index 100% rename from appstore/casdoor/1.964.0/envs/casdoor.env rename to appstore/casdoor/1.966.0/envs/casdoor.env diff --git a/appstore/casdoor/1.964.0/envs/default.env b/appstore/casdoor/1.966.0/envs/default.env similarity index 100% rename from appstore/casdoor/1.964.0/envs/default.env rename to appstore/casdoor/1.966.0/envs/default.env diff --git a/appstore/casdoor/1.964.0/envs/global.env b/appstore/casdoor/1.966.0/envs/global.env similarity index 100% rename from appstore/casdoor/1.964.0/envs/global.env rename to appstore/casdoor/1.966.0/envs/global.env diff --git a/appstore/casdoor/1.964.0/scripts/init.sh b/appstore/casdoor/1.966.0/scripts/init.sh similarity index 100% rename from appstore/casdoor/1.964.0/scripts/init.sh rename to appstore/casdoor/1.966.0/scripts/init.sh diff --git a/appstore/casdoor/1.964.0/scripts/uninstall.sh b/appstore/casdoor/1.966.0/scripts/uninstall.sh similarity index 100% rename from appstore/casdoor/1.964.0/scripts/uninstall.sh rename to appstore/casdoor/1.966.0/scripts/uninstall.sh diff --git a/appstore/casdoor/1.964.0/scripts/upgrade.sh b/appstore/casdoor/1.966.0/scripts/upgrade.sh similarity index 100% rename from appstore/casdoor/1.964.0/scripts/upgrade.sh rename to appstore/casdoor/1.966.0/scripts/upgrade.sh diff --git a/appstore/elastic-elasticsearch/8.18.2/.env b/appstore/elastic-elasticsearch/8.18.3/.env similarity index 100% rename from appstore/elastic-elasticsearch/8.18.2/.env rename to appstore/elastic-elasticsearch/8.18.3/.env diff --git a/appstore/elastic-elasticsearch/8.18.2/data.yml b/appstore/elastic-elasticsearch/8.18.3/data.yml similarity index 100% rename from appstore/elastic-elasticsearch/8.18.2/data.yml rename to appstore/elastic-elasticsearch/8.18.3/data.yml diff --git a/appstore/elastic-elasticsearch/8.18.2/docker-compose.yml b/appstore/elastic-elasticsearch/8.18.3/docker-compose.yml similarity index 96% rename from appstore/elastic-elasticsearch/8.18.2/docker-compose.yml rename to appstore/elastic-elasticsearch/8.18.3/docker-compose.yml index f458aaefe..ad48150b1 100644 --- a/appstore/elastic-elasticsearch/8.18.2/docker-compose.yml +++ b/appstore/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/appstore/elastic-elasticsearch/8.18.2/envs/default.env b/appstore/elastic-elasticsearch/8.18.3/envs/default.env similarity index 100% rename from appstore/elastic-elasticsearch/8.18.2/envs/default.env rename to appstore/elastic-elasticsearch/8.18.3/envs/default.env diff --git a/appstore/elastic-elasticsearch/8.18.2/envs/global.env b/appstore/elastic-elasticsearch/8.18.3/envs/global.env similarity index 100% rename from appstore/elastic-elasticsearch/8.18.2/envs/global.env rename to appstore/elastic-elasticsearch/8.18.3/envs/global.env diff --git a/appstore/elastic-elasticsearch/8.18.2/scripts/init.sh b/appstore/elastic-elasticsearch/8.18.3/scripts/init.sh similarity index 100% rename from appstore/elastic-elasticsearch/8.18.2/scripts/init.sh rename to appstore/elastic-elasticsearch/8.18.3/scripts/init.sh diff --git a/appstore/elastic-elasticsearch/8.18.2/scripts/uninstall.sh b/appstore/elastic-elasticsearch/8.18.3/scripts/uninstall.sh similarity index 100% rename from appstore/elastic-elasticsearch/8.18.2/scripts/uninstall.sh rename to appstore/elastic-elasticsearch/8.18.3/scripts/uninstall.sh diff --git a/appstore/elastic-elasticsearch/8.18.2/scripts/upgrade.sh b/appstore/elastic-elasticsearch/8.18.3/scripts/upgrade.sh similarity index 100% rename from appstore/elastic-elasticsearch/8.18.2/scripts/upgrade.sh rename to appstore/elastic-elasticsearch/8.18.3/scripts/upgrade.sh diff --git a/appstore/elastic-elasticsearch/9.0.2/.env b/appstore/elastic-elasticsearch/9.0.3/.env similarity index 100% rename from appstore/elastic-elasticsearch/9.0.2/.env rename to appstore/elastic-elasticsearch/9.0.3/.env diff --git a/appstore/elastic-elasticsearch/9.0.2/data.yml b/appstore/elastic-elasticsearch/9.0.3/data.yml similarity index 100% rename from appstore/elastic-elasticsearch/9.0.2/data.yml rename to appstore/elastic-elasticsearch/9.0.3/data.yml diff --git a/appstore/elastic-elasticsearch/9.0.2/docker-compose.yml b/appstore/elastic-elasticsearch/9.0.3/docker-compose.yml similarity index 96% rename from appstore/elastic-elasticsearch/9.0.2/docker-compose.yml rename to appstore/elastic-elasticsearch/9.0.3/docker-compose.yml index d9d202a76..4c7ede3ad 100644 --- a/appstore/elastic-elasticsearch/9.0.2/docker-compose.yml +++ b/appstore/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/appstore/elastic-elasticsearch/9.0.2/envs/default.env b/appstore/elastic-elasticsearch/9.0.3/envs/default.env similarity index 100% rename from appstore/elastic-elasticsearch/9.0.2/envs/default.env rename to appstore/elastic-elasticsearch/9.0.3/envs/default.env diff --git a/appstore/elastic-elasticsearch/9.0.2/envs/global.env b/appstore/elastic-elasticsearch/9.0.3/envs/global.env similarity index 100% rename from appstore/elastic-elasticsearch/9.0.2/envs/global.env rename to appstore/elastic-elasticsearch/9.0.3/envs/global.env diff --git a/appstore/elastic-elasticsearch/9.0.2/scripts/init.sh b/appstore/elastic-elasticsearch/9.0.3/scripts/init.sh similarity index 100% rename from appstore/elastic-elasticsearch/9.0.2/scripts/init.sh rename to appstore/elastic-elasticsearch/9.0.3/scripts/init.sh diff --git a/appstore/elastic-elasticsearch/9.0.2/scripts/uninstall.sh b/appstore/elastic-elasticsearch/9.0.3/scripts/uninstall.sh similarity index 100% rename from appstore/elastic-elasticsearch/9.0.2/scripts/uninstall.sh rename to appstore/elastic-elasticsearch/9.0.3/scripts/uninstall.sh diff --git a/appstore/elastic-elasticsearch/9.0.2/scripts/upgrade.sh b/appstore/elastic-elasticsearch/9.0.3/scripts/upgrade.sh similarity index 100% rename from appstore/elastic-elasticsearch/9.0.2/scripts/upgrade.sh rename to appstore/elastic-elasticsearch/9.0.3/scripts/upgrade.sh diff --git a/appstore/elastic-kibana/8.18.2/.env b/appstore/elastic-kibana/8.18.3/.env similarity index 100% rename from appstore/elastic-kibana/8.18.2/.env rename to appstore/elastic-kibana/8.18.3/.env diff --git a/appstore/elastic-kibana/8.18.2/data.yml b/appstore/elastic-kibana/8.18.3/data.yml similarity index 100% rename from appstore/elastic-kibana/8.18.2/data.yml rename to appstore/elastic-kibana/8.18.3/data.yml diff --git a/dockge/elastic-kibana_9_0_2/docker-compose.yml b/appstore/elastic-kibana/8.18.3/docker-compose.yml similarity index 95% rename from dockge/elastic-kibana_9_0_2/docker-compose.yml rename to appstore/elastic-kibana/8.18.3/docker-compose.yml index d030b33fb..c090766d2 100644 --- a/dockge/elastic-kibana_9_0_2/docker-compose.yml +++ b/appstore/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:9.0.2 + image: kibana:8.18.3 labels: createdBy: Apps networks: diff --git a/appstore/elastic-kibana/8.18.2/envs/default.env b/appstore/elastic-kibana/8.18.3/envs/default.env similarity index 100% rename from appstore/elastic-kibana/8.18.2/envs/default.env rename to appstore/elastic-kibana/8.18.3/envs/default.env diff --git a/appstore/elastic-kibana/8.18.2/envs/global.env b/appstore/elastic-kibana/8.18.3/envs/global.env similarity index 100% rename from appstore/elastic-kibana/8.18.2/envs/global.env rename to appstore/elastic-kibana/8.18.3/envs/global.env diff --git a/appstore/elastic-kibana/8.18.2/scripts/init.sh b/appstore/elastic-kibana/8.18.3/scripts/init.sh similarity index 100% rename from appstore/elastic-kibana/8.18.2/scripts/init.sh rename to appstore/elastic-kibana/8.18.3/scripts/init.sh diff --git a/appstore/elastic-kibana/8.18.2/scripts/uninstall.sh b/appstore/elastic-kibana/8.18.3/scripts/uninstall.sh similarity index 100% rename from appstore/elastic-kibana/8.18.2/scripts/uninstall.sh rename to appstore/elastic-kibana/8.18.3/scripts/uninstall.sh diff --git a/appstore/elastic-kibana/8.18.2/scripts/upgrade.sh b/appstore/elastic-kibana/8.18.3/scripts/upgrade.sh similarity index 100% rename from appstore/elastic-kibana/8.18.2/scripts/upgrade.sh rename to appstore/elastic-kibana/8.18.3/scripts/upgrade.sh diff --git a/appstore/elastic-kibana/9.0.2/.env b/appstore/elastic-kibana/9.0.3/.env similarity index 100% rename from appstore/elastic-kibana/9.0.2/.env rename to appstore/elastic-kibana/9.0.3/.env diff --git a/appstore/elastic-kibana/9.0.2/data.yml b/appstore/elastic-kibana/9.0.3/data.yml similarity index 100% rename from appstore/elastic-kibana/9.0.2/data.yml rename to appstore/elastic-kibana/9.0.3/data.yml diff --git a/appstore/elastic-kibana/9.0.2/docker-compose.yml b/appstore/elastic-kibana/9.0.3/docker-compose.yml similarity index 95% rename from appstore/elastic-kibana/9.0.2/docker-compose.yml rename to appstore/elastic-kibana/9.0.3/docker-compose.yml index d030b33fb..49f2e1c81 100644 --- a/appstore/elastic-kibana/9.0.2/docker-compose.yml +++ b/appstore/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/appstore/elastic-kibana/9.0.2/envs/default.env b/appstore/elastic-kibana/9.0.3/envs/default.env similarity index 100% rename from appstore/elastic-kibana/9.0.2/envs/default.env rename to appstore/elastic-kibana/9.0.3/envs/default.env diff --git a/appstore/elastic-kibana/9.0.2/envs/global.env b/appstore/elastic-kibana/9.0.3/envs/global.env similarity index 100% rename from appstore/elastic-kibana/9.0.2/envs/global.env rename to appstore/elastic-kibana/9.0.3/envs/global.env diff --git a/appstore/elastic-kibana/9.0.2/scripts/init.sh b/appstore/elastic-kibana/9.0.3/scripts/init.sh similarity index 100% rename from appstore/elastic-kibana/9.0.2/scripts/init.sh rename to appstore/elastic-kibana/9.0.3/scripts/init.sh diff --git a/appstore/elastic-kibana/9.0.2/scripts/uninstall.sh b/appstore/elastic-kibana/9.0.3/scripts/uninstall.sh similarity index 100% rename from appstore/elastic-kibana/9.0.2/scripts/uninstall.sh rename to appstore/elastic-kibana/9.0.3/scripts/uninstall.sh diff --git a/appstore/elastic-kibana/9.0.2/scripts/upgrade.sh b/appstore/elastic-kibana/9.0.3/scripts/upgrade.sh similarity index 100% rename from appstore/elastic-kibana/9.0.2/scripts/upgrade.sh rename to appstore/elastic-kibana/9.0.3/scripts/upgrade.sh diff --git a/appstore/rustdesk-api/2.6.24/.env b/appstore/rustdesk-api/2.6.25/.env similarity index 62% rename from appstore/rustdesk-api/2.6.24/.env rename to appstore/rustdesk-api/2.6.25/.env index 194473985..5e9e80c58 100644 --- a/appstore/rustdesk-api/2.6.24/.env +++ b/appstore/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/appstore/rustdesk-api/2.6.24/conf/hbbr/run b/appstore/rustdesk-api/2.6.25/conf/hbbr/run similarity index 100% rename from appstore/rustdesk-api/2.6.24/conf/hbbr/run rename to appstore/rustdesk-api/2.6.25/conf/hbbr/run diff --git a/appstore/rustdesk-api/2.6.24/conf/hbbs/run b/appstore/rustdesk-api/2.6.25/conf/hbbs/run similarity index 100% rename from appstore/rustdesk-api/2.6.24/conf/hbbs/run rename to appstore/rustdesk-api/2.6.25/conf/hbbs/run diff --git a/appstore/rustdesk-api/2.6.24/data.yml b/appstore/rustdesk-api/2.6.25/data.yml similarity index 69% rename from appstore/rustdesk-api/2.6.24/data.yml rename to appstore/rustdesk-api/2.6.25/data.yml index 59692032e..85393a6bd 100644 --- a/appstore/rustdesk-api/2.6.24/data.yml +++ b/appstore/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/appstore/rustdesk-api/2.6.24/docker-compose.yml b/appstore/rustdesk-api/2.6.25/docker-compose.yml similarity index 60% rename from appstore/rustdesk-api/2.6.24/docker-compose.yml rename to appstore/rustdesk-api/2.6.25/docker-compose.yml index 34d4ae727..490a9d74c 100644 --- a/appstore/rustdesk-api/2.6.24/docker-compose.yml +++ b/appstore/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/appstore/rustdesk-api/2.6.24/envs/default.env b/appstore/rustdesk-api/2.6.25/envs/default.env similarity index 100% rename from appstore/rustdesk-api/2.6.24/envs/default.env rename to appstore/rustdesk-api/2.6.25/envs/default.env diff --git a/appstore/rustdesk-api/2.6.24/envs/global.env b/appstore/rustdesk-api/2.6.25/envs/global.env similarity index 100% rename from appstore/rustdesk-api/2.6.24/envs/global.env rename to appstore/rustdesk-api/2.6.25/envs/global.env diff --git a/appstore/rustdesk-api/2.6.24/scripts/init.sh b/appstore/rustdesk-api/2.6.25/scripts/init.sh similarity index 100% rename from appstore/rustdesk-api/2.6.24/scripts/init.sh rename to appstore/rustdesk-api/2.6.25/scripts/init.sh diff --git a/appstore/rustdesk-api/2.6.24/scripts/uninstall.sh b/appstore/rustdesk-api/2.6.25/scripts/uninstall.sh similarity index 100% rename from appstore/rustdesk-api/2.6.24/scripts/uninstall.sh rename to appstore/rustdesk-api/2.6.25/scripts/uninstall.sh diff --git a/appstore/rustdesk-api/2.6.24/scripts/upgrade.sh b/appstore/rustdesk-api/2.6.25/scripts/upgrade.sh similarity index 100% rename from appstore/rustdesk-api/2.6.24/scripts/upgrade.sh rename to appstore/rustdesk-api/2.6.25/scripts/upgrade.sh diff --git a/appstore/slink/1.5.1/.env b/appstore/slink/1.6.0/.env similarity index 100% rename from appstore/slink/1.5.1/.env rename to appstore/slink/1.6.0/.env diff --git a/appstore/slink/1.5.1/data.yml b/appstore/slink/1.6.0/data.yml similarity index 100% rename from appstore/slink/1.5.1/data.yml rename to appstore/slink/1.6.0/data.yml diff --git a/appstore/slink/1.5.1/docker-compose.yml b/appstore/slink/1.6.0/docker-compose.yml similarity index 94% rename from appstore/slink/1.5.1/docker-compose.yml rename to appstore/slink/1.6.0/docker-compose.yml index a3773d127..3818d06fd 100644 --- a/appstore/slink/1.5.1/docker-compose.yml +++ b/appstore/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/appstore/slink/1.5.1/envs/default.env b/appstore/slink/1.6.0/envs/default.env similarity index 100% rename from appstore/slink/1.5.1/envs/default.env rename to appstore/slink/1.6.0/envs/default.env diff --git a/appstore/slink/1.5.1/envs/global.env b/appstore/slink/1.6.0/envs/global.env similarity index 100% rename from appstore/slink/1.5.1/envs/global.env rename to appstore/slink/1.6.0/envs/global.env diff --git a/appstore/slink/1.5.1/scripts/init.sh b/appstore/slink/1.6.0/scripts/init.sh similarity index 100% rename from appstore/slink/1.5.1/scripts/init.sh rename to appstore/slink/1.6.0/scripts/init.sh diff --git a/appstore/slink/1.5.1/scripts/uninstall.sh b/appstore/slink/1.6.0/scripts/uninstall.sh similarity index 100% rename from appstore/slink/1.5.1/scripts/uninstall.sh rename to appstore/slink/1.6.0/scripts/uninstall.sh diff --git a/appstore/slink/1.5.1/scripts/upgrade.sh b/appstore/slink/1.6.0/scripts/upgrade.sh similarity index 100% rename from appstore/slink/1.5.1/scripts/upgrade.sh rename to appstore/slink/1.6.0/scripts/upgrade.sh diff --git a/dockge/ammds-ol8/docker-compose.yml b/dockge/ammds-ol8/docker-compose.yml index 70540bfca..6aafec247 100644 --- a/dockge/ammds-ol8/docker-compose.yml +++ b/dockge/ammds-ol8/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/dockge/ammds/docker-compose.yml b/dockge/ammds/docker-compose.yml index f4eeb664c..decbb34c9 100644 --- a/dockge/ammds/docker-compose.yml +++ b/dockge/ammds/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/dockge/ani-rss/docker-compose.yml b/dockge/ani-rss/docker-compose.yml index 9c6e13c66..075d74ff7 100644 --- a/dockge/ani-rss/docker-compose.yml +++ b/dockge/ani-rss/docker-compose.yml @@ -8,10 +8,13 @@ services: - ./envs/global.env - .env environment: + - PUID=0 + - PGID=0 + - UMASK=022 - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v1.2.82 + image: wushuo894/ani-rss:v2.0.22 labels: createdBy: Apps networks: diff --git a/dockge/ani-rss_2_0_21/.env b/dockge/ani-rss_1_2_82/.env similarity index 100% rename from dockge/ani-rss_2_0_21/.env rename to dockge/ani-rss_1_2_82/.env diff --git a/dockge/ani-rss_2_0_21/docker-compose.yml b/dockge/ani-rss_1_2_82/docker-compose.yml similarity index 90% rename from dockge/ani-rss_2_0_21/docker-compose.yml rename to dockge/ani-rss_1_2_82/docker-compose.yml index 64f4e3f4c..9c6e13c66 100644 --- a/dockge/ani-rss_2_0_21/docker-compose.yml +++ b/dockge/ani-rss_1_2_82/docker-compose.yml @@ -8,13 +8,10 @@ services: - ./envs/global.env - .env environment: - - PUID=0 - - PGID=0 - - UMASK=022 - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v2.0.21 + image: wushuo894/ani-rss:v1.2.82 labels: createdBy: Apps networks: diff --git a/dockge/ani-rss_2_0_21/envs/default.env b/dockge/ani-rss_1_2_82/envs/default.env similarity index 100% rename from dockge/ani-rss_2_0_21/envs/default.env rename to dockge/ani-rss_1_2_82/envs/default.env diff --git a/dockge/ani-rss_2_0_21/envs/global.env b/dockge/ani-rss_1_2_82/envs/global.env similarity index 100% rename from dockge/ani-rss_2_0_21/envs/global.env rename to dockge/ani-rss_1_2_82/envs/global.env diff --git a/dockge/casdoor/docker-compose.yml b/dockge/casdoor/docker-compose.yml index 86b620dcb..cad7fb219 100644 --- a/dockge/casdoor/docker-compose.yml +++ b/dockge/casdoor/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/dockge/elastic-elasticsearch/docker-compose.yml b/dockge/elastic-elasticsearch/docker-compose.yml index f458aaefe..4c7ede3ad 100644 --- a/dockge/elastic-elasticsearch/docker-compose.yml +++ b/dockge/elastic-elasticsearch/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:9.0.3 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_9_0_2/.env b/dockge/elastic-elasticsearch_8_18_3/.env similarity index 100% rename from dockge/elastic-elasticsearch_9_0_2/.env rename to dockge/elastic-elasticsearch_8_18_3/.env diff --git a/dockge/elastic-elasticsearch_9_0_2/docker-compose.yml b/dockge/elastic-elasticsearch_8_18_3/docker-compose.yml similarity index 96% rename from dockge/elastic-elasticsearch_9_0_2/docker-compose.yml rename to dockge/elastic-elasticsearch_8_18_3/docker-compose.yml index d9d202a76..ad48150b1 100644 --- a/dockge/elastic-elasticsearch_9_0_2/docker-compose.yml +++ b/dockge/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:9.0.2 + image: elasticsearch:8.18.3 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_9_0_2/envs/default.env b/dockge/elastic-elasticsearch_8_18_3/envs/default.env similarity index 100% rename from dockge/elastic-elasticsearch_9_0_2/envs/default.env rename to dockge/elastic-elasticsearch_8_18_3/envs/default.env diff --git a/dockge/elastic-elasticsearch_9_0_2/envs/global.env b/dockge/elastic-elasticsearch_8_18_3/envs/global.env similarity index 100% rename from dockge/elastic-elasticsearch_9_0_2/envs/global.env rename to dockge/elastic-elasticsearch_8_18_3/envs/global.env diff --git a/dockge/elastic-kibana/docker-compose.yml b/dockge/elastic-kibana/docker-compose.yml index 76989c30f..49f2e1c81 100644 --- a/dockge/elastic-kibana/docker-compose.yml +++ b/dockge/elastic-kibana/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:9.0.3 labels: createdBy: Apps networks: diff --git a/dockge/elastic-kibana_9_0_2/.env b/dockge/elastic-kibana_8_18_3/.env similarity index 100% rename from dockge/elastic-kibana_9_0_2/.env rename to dockge/elastic-kibana_8_18_3/.env diff --git a/appstore/elastic-kibana/8.18.2/docker-compose.yml b/dockge/elastic-kibana_8_18_3/docker-compose.yml similarity index 95% rename from appstore/elastic-kibana/8.18.2/docker-compose.yml rename to dockge/elastic-kibana_8_18_3/docker-compose.yml index 76989c30f..c090766d2 100644 --- a/appstore/elastic-kibana/8.18.2/docker-compose.yml +++ b/dockge/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/dockge/elastic-kibana_9_0_2/envs/default.env b/dockge/elastic-kibana_8_18_3/envs/default.env similarity index 100% rename from dockge/elastic-kibana_9_0_2/envs/default.env rename to dockge/elastic-kibana_8_18_3/envs/default.env diff --git a/dockge/elastic-kibana_9_0_2/envs/global.env b/dockge/elastic-kibana_8_18_3/envs/global.env similarity index 100% rename from dockge/elastic-kibana_9_0_2/envs/global.env rename to dockge/elastic-kibana_8_18_3/envs/global.env diff --git a/dockge/rustdesk-api/.env b/dockge/rustdesk-api/.env index 194473985..5e9e80c58 100644 --- a/dockge/rustdesk-api/.env +++ b/dockge/rustdesk-api/.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/dockge/rustdesk-api/docker-compose.yml b/dockge/rustdesk-api/docker-compose.yml index 34d4ae727..490a9d74c 100644 --- a/dockge/rustdesk-api/docker-compose.yml +++ b/dockge/rustdesk-api/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/dockge/slink/docker-compose.yml b/dockge/slink/docker-compose.yml index a3773d127..3818d06fd 100644 --- a/dockge/slink/docker-compose.yml +++ b/dockge/slink/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: