Merge remote-tracking branch 'origin/custom' into custom

apps/ammds/1.4.13/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   ammds:
-    image: qyg2297248353/ammds:v1.4.12
+    image: qyg2297248353/ammds:v1.4.13
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"

apps/beszel-agent/0.11.0/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   beszel-agent:
-    image: henrygd/beszel-agent:0.10.2
+    image: henrygd/beszel-agent:0.11.0
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"

apps/beszel/0.11.0/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   beszel:
-    image: henrygd/beszel:0.10.2
+    image: henrygd/beszel:0.11.0
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"

apps/dozzle/8.12.13/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   dozzle:
-    image: amir20/dozzle:v8.12.12
+    image: amir20/dozzle:v8.12.13
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"

apps/halo-h2/2.20.19/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   halo:
-    image: halohub/halo:2.20.18
+    image: halohub/halo:2.20.19
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"

apps/halo/2.20.19/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   halo:
-    image: halohub/halo:2.20.18
+    image: halohub/halo:2.20.19
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"

apps/nacos/3.0.0/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   nacos:
-    image: nacos/nacos-server:v2.5.1
+    image: nacos/nacos-server:v3.0.0
     container_name: ${CONTAINER_NAME}
     restart: always
     labels:

appstore/ammds/1.4.13/docker-compose.yml

@@ -11,7 +11,7 @@ services:
     - TZ=Asia/Shanghai
     - NGINX_PORT=${PANEL_APP_PORT_HTTP:-8080}
     - AMMDS_SERVER_PORT=${PANEL_APP_PORT_API:-9523}
-    image: qyg2297248353/ammds:v1.4.12
+    image: qyg2297248353/ammds:v1.4.13
     labels:
       createdBy: Apps
     network_mode: ${NETWORK_MODE:-host}

appstore/halo-h2/2.20.19/docker-compose.yml

@@ -9,7 +9,7 @@ services:
     container_name: halo-h2
     environment:
     - JVM_OPTS=-Xmx256m -Xms256m
-    image: halohub/halo:2.20.18
+    image: halohub/halo:2.20.19
     labels:
       createdBy: Apps
     networks:

appstore/halo/2.20.19/docker-compose.yml

@@ -11,7 +11,7 @@ services:
     - --halo.external-url=${HALO_EXTERNAL_URL}
     - --halo.security.remember-me.token-validity=${HALO_REMEMBER_ME_TOKEN_VALIDITY}
     container_name: halo
-    image: halohub/halo:2.20.18
+    image: halohub/halo:2.20.19
     labels:
       createdBy: Apps
     networks:

appstore/nacos/3.0.0/docker-compose.yml

@@ -12,7 +12,7 @@ services:
     - NACOS_SERVER_PORT=8848
     - NACOS_AUTH_ENABLE=true
     - SPRING_DATASOURCE_PLATFORM=mysql
-    image: nacos/nacos-server:v2.5.1
+    image: nacos/nacos-server:v3.0.0
     labels:
       createdBy: Apps
     network_mode: ${NETWORK_MODE}

appstore/rustdesk-api/2.6.19/data.yml

@@ -31,7 +31,7 @@ additionalProperties:
       type: text
     - default: ""
       edit: true
-      envKey: KEY
+      envKey: RUSTDESK_API_RUSTDESK_KEY
       labelZh: RustDesk API 密钥
       labelEn: RustDesk API key
       required: true

appstore/rustdesk-api/2.6.19/docker-compose.yml

@@ -13,6 +13,7 @@ services:
     - 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.19
     labels:
       createdBy: Apps
@@ -33,6 +34,7 @@ services:
     - RUSTDESK_API_LANG=zh-CN
     - RELAY=${RUSTDESK_SERVER_URL}:21117
     - ENCRYPTED_ONLY=1
+    - RUSTDESK_API_RUSTDESK_KEY=${KEY}
     image: rustdesk/rustdesk-server-s6:latest
     labels:
       createdBy: Apps

appstore/rustdesk-api/README.md

@@ -12,8 +12,16 @@ RustDesk 是一款远程访问和远程控制软件
 
 ## 安装说明
 
+> 默认用户名：`admin`
+>
+> 默认密码：`请前往日志查看`
+>
+> 请及时修改密码
+
 ### 端口
 
+> 如果您使用云服务器，请注意云防火墙将必要端口打开
+
 RustDesk 服务器自托管所需的端口很大程度上取决于您的环境以及您希望使用 RustDesk 做什么。
 
 核心端口：

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.4.12
+    image: qyg2297248353/ammds:v1.4.13
     labels:
       createdBy: Apps
     network_mode: ${NETWORK_MODE:-host}

dockge/halo-h2/docker-compose.yml

@@ -9,7 +9,7 @@ services:
     container_name: halo-h2
     environment:
     - JVM_OPTS=-Xmx256m -Xms256m
-    image: halohub/halo:2.20.18
+    image: halohub/halo:2.20.19
     labels:
       createdBy: Apps
     networks:

dockge/halo/docker-compose.yml

@@ -11,7 +11,7 @@ services:
     - --halo.external-url=${HALO_EXTERNAL_URL}
     - --halo.security.remember-me.token-validity=${HALO_REMEMBER_ME_TOKEN_VALIDITY}
     container_name: halo
-    image: halohub/halo:2.20.18
+    image: halohub/halo:2.20.19
     labels:
       createdBy: Apps
     networks:

dockge/nacos/docker-compose.yml

@@ -12,7 +12,7 @@ services:
     - NACOS_SERVER_PORT=8848
     - NACOS_AUTH_ENABLE=true
     - SPRING_DATASOURCE_PLATFORM=mysql
-    image: nacos/nacos-server:v2.5.1
+    image: nacos/nacos-server:v3.0.0
     labels:
       createdBy: Apps
     network_mode: ${NETWORK_MODE}

dockge/rustdesk-api/docker-compose.yml

@@ -13,6 +13,7 @@ services:
     - 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.19
     labels:
       createdBy: Apps
@@ -33,6 +34,7 @@ services:
     - RUSTDESK_API_LANG=zh-CN
     - RELAY=${RUSTDESK_SERVER_URL}:21117
     - ENCRYPTED_ONLY=1
+    - RUSTDESK_API_RUSTDESK_KEY=${KEY}
     image: rustdesk/rustdesk-server-s6:latest
     labels:
       createdBy: Apps