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

apps/astrbot-napcat/4.17.52/docker-compose.yml

@@ -24,7 +24,7 @@ services:
       - NAPCAT_UID=${NAPCAT_UID:-1000}
       - NAPCAT_GID=${NAPCAT_GID:-1000}
   astrbot:
-    image: soulter/astrbot:v4.20.0
+    image: soulter/astrbot:v4.20.1
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"

apps/astrbot/4.20.1/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   astrbot:
-    image: soulter/astrbot:v4.20.0
+    image: soulter/astrbot:v4.20.1
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"

apps/clouddrive2/1.0.1/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   clouddrive2:
-    image: cloudnas/clouddrive2:1.0.0
+    image: cloudnas/clouddrive2:1.0.1
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"

apps/ech0/4.1.4/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   app_name:
-    image: sn0wl1n/ech0:v4.1.3
+    image: sn0wl1n/ech0:v4.1.4
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"

apps/emby-pulse/1.2.0.735/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   emby-pulse:
-    image: zeyu8023/emby-stats:1.2.0.728
+    image: zeyu8023/emby-stats:1.2.0.735
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"

apps/omnibox/2.0.3/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   omnibox:
-    image: lampon/omnibox:v2.0.2
+    image: lampon/omnibox:2.0.3
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"

appstore/astrbot-napcat/4.17.52/docker-compose.yml

@@ -9,7 +9,7 @@ services:
     - .env
     environment:
     - TZ=Asia/Shanghai
-    image: soulter/astrbot:v4.20.0
+    image: soulter/astrbot:v4.20.1
     labels:
       createdBy: Apps
     networks:

appstore/astrbot/4.20.1/docker-compose.yml

@@ -9,7 +9,7 @@ services:
     - .env
     environment:
     - TZ=Asia/Shanghai
-    image: soulter/astrbot:v4.20.0
+    image: soulter/astrbot:v4.20.1
     labels:
       createdBy: Apps
     networks:

appstore/clouddrive2/1.0.1/docker-compose.yml

@@ -14,7 +14,7 @@ services:
     environment:
     - TZ=Asia/Shanghai
     - CLOUDDRIVE_HOME=/Config
-    image: cloudnas/clouddrive2:0.9.24
+    image: cloudnas/clouddrive2:1.0.1
     labels:
       createdBy: Apps
     networks:

appstore/dujiaonext/0.1.1/docker-compose.yml

@@ -14,7 +14,7 @@ services:
     - .env
     environment:
     - TZ=Asia/Shanghai
-    image: dujiaonext/admin:v0.1.0
+    image: dujiaonext/admin:v0.1.1
     networks:
     - dujiao-net
     ports:

appstore/ech0/4.1.4/docker-compose.yml

@@ -10,7 +10,7 @@ services:
     environment:
     - TZ=Asia/Shanghai
     - HTTPS_PROXY=${HTTP_PROXY}
-    image: sn0wl1n/ech0:v3.1.4
+    image: sn0wl1n/ech0:v4.1.4
     labels:
       createdBy: Apps
     networks:

appstore/emby-pulse/1.2.0.735/docker-compose.yml

@@ -11,7 +11,7 @@ services:
     - TZ=Asia/Shanghai
     - DB_PATH=/emby-data/playback_reporting.db
     - playback_data_mode=sqlite
-    image: zeyu8023/emby-stats:1.2.0.725
+    image: zeyu8023/emby-stats:1.2.0.735
     labels:
       createdBy: Apps
     networks:

appstore/omnibox/2.0.3/docker-compose.yml

@@ -9,7 +9,7 @@ services:
     - .env
     environment:
     - TZ=Asia/Shanghai
-    image: lampon/omnibox:v2.0.2
+    image: lampon/omnibox:2.0.3
     labels:
       createdBy: Apps
     networks:

appstore/rustfs/1.0.0-alpha.86/.env

@@ -0,0 +1,21 @@
+# 数据持久化路径 [必填] 
+RUSTFS_ROOT_PATH=/home/rustfs
+
+# WebUI 端口 [必填] 
+PANEL_APP_PORT_HTTP=9001
+
+# API 端口 [必填] 
+PANEL_APP_PORT_API=9000
+
+# 管理员账号 [必填] 
+RUSTFS_ACCESS_KEY=rustfsadmin
+
+# 管理员密码 [必填] 
+RUSTFS_SECRET_KEY=rustfsadmin
+
+# 域名 
+RUSTFS_SERVER_DOMAINS=example.com
+
+# 启用控制台 [必填] 
+RUSTFS_CONSOLE_ENABLE=true
+

appstore/rustfs/1.0.0-alpha.86/data.yml

@@ -0,0 +1,58 @@
+additionalProperties:
+  formFields:
+    - default: "/home/rustfs"
+      edit: true
+      envKey: RUSTFS_ROOT_PATH
+      labelZh: 数据持久化路径
+      labelEn: Data persistence path
+      required: true
+      type: text
+    - default: 9001
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelZh: WebUI 端口
+      labelEn: WebUI port
+      required: true
+      rule: paramPort
+      type: number
+    - default: 9000
+      edit: true
+      envKey: PANEL_APP_PORT_API
+      labelZh: API 端口
+      labelEn: API port
+      required: true
+      rule: paramPort
+      type: number
+    - default: "rustfsadmin"
+      edit: true
+      envKey: RUSTFS_ACCESS_KEY
+      labelZh: 管理员账号
+      labelEn: Access Key
+      required: true
+      type: text
+    - default: "rustfsadmin"
+      edit: true
+      envKey: RUSTFS_SECRET_KEY
+      labelZh: 管理员密码
+      labelEn: Secret Key
+      required: true
+      type: password
+    - default: "example.com"
+      edit: true
+      envKey: RUSTFS_SERVER_DOMAINS
+      labelZh: 域名
+      labelEn: Domains
+      required: false
+      type: text
+    - default: "true"
+      edit: true
+      envKey: RUSTFS_CONSOLE_ENABLE
+      labelZh: 启用控制台
+      labelEn: Enable Console
+      required: true
+      type: select
+      values:
+        - label: 启用
+          value: "true"
+        - label: 禁用
+          value: "false"

appstore/rustfs/1.0.0-alpha.86/docker-compose.yml

@@ -0,0 +1,48 @@
+networks:
+  1panel-network:
+    external: true
+services:
+  rustfs:
+    container_name: rustfs
+    env_file:
+    - ./envs/global.env
+    - .env
+    environment:
+    - TZ=Asia/Shanghai
+    - RUSTFS_VOLUMES=/data/rustfs{0...3}
+    - RUSTFS_ADDRESS=0.0.0.0:9000
+    - RUSTFS_CONSOLE_ADDRESS=0.0.0.0:9001
+    - RUSTFS_CONSOLE_ENABLE=true
+    - RUSTFS_CORS_ALLOWED_ORIGINS=*
+    - RUSTFS_CONSOLE_CORS_ALLOWED_ORIGINS=*
+    - RUSTFS_OBS_LOGGER_LEVEL=info
+    - RUSTFS_TLS_PATH=/opt/tls
+    - RUSTFS_OBJECT_CACHE_ENABLE=true
+    - RUSTFS_OBJECT_CACHE_TTL_SECS=300
+    healthcheck:
+      interval: 30s
+      retries: 3
+      start_period: 40s
+      test:
+      - CMD
+      - sh
+      - -c
+      - curl -f http://127.0.0.1:9000/health && curl -f http://127.0.0.1:9001/rustfs/console/health
+      timeout: 10s
+    image: rustfs/rustfs:1.0.0-alpha.86
+    labels:
+      createdBy: Apps
+    networks:
+    - 1panel-network
+    ports:
+    - ${PANEL_APP_PORT_API}:9000
+    - ${PANEL_APP_PORT_HTTP}:9001
+    restart: always
+    security_opt:
+    - no-new-privileges:true
+    volumes:
+    - ${RUSTFS_ROOT_PATH}/logs:/app/logs
+    - ${RUSTFS_ROOT_PATH}/data/rustfs0:/data/rustfs0
+    - ${RUSTFS_ROOT_PATH}/data/rustfs1:/data/rustfs1
+    - ${RUSTFS_ROOT_PATH}/data/rustfs2:/data/rustfs2
+    - ${RUSTFS_ROOT_PATH}/data/rustfs3:/data/rustfs3

appstore/rustfs/1.0.0-alpha.86/scripts/init.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  # setup-1 add default values
+  CURRENT_DIR=$(pwd)
+  sed -i '/^ENV_FILE=/d' .env
+  sed -i '/^GLOBAL_ENV_FILE=/d' .env
+  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
+  echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
+
+
+  mkdir -p "$RUSTFS_ROOT_PATH"
+  mkdir -p "$RUSTFS_ROOT_PATH/logs"
+  mkdir -p "$RUSTFS_ROOT_PATH/data"
+  mkdir -p "$RUSTFS_ROOT_PATH/data/rustfs0"
+  mkdir -p "$RUSTFS_ROOT_PATH/data/rustfs1"
+  mkdir -p "$RUSTFS_ROOT_PATH/data/rustfs2"
+  mkdir -p "$RUSTFS_ROOT_PATH/data/rustfs3"
+
+  chown -R 10001:10001 "$RUSTFS_ROOT_PATH"
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi

appstore/rustfs/1.0.0-alpha.86/scripts/uninstall.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi

appstore/rustfs/1.0.0-alpha.86/scripts/upgrade.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  # setup-1 add default values
+  CURRENT_DIR=$(pwd)
+  sed -i '/^ENV_FILE=/d' .env
+  sed -i '/^GLOBAL_ENV_FILE=/d' .env
+  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
+  echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
+
+  chown -R 10001:10001 "$RUSTFS_ROOT_PATH"
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi

appstore/rustfs/latest/.env

@@ -2,7 +2,10 @@
 RUSTFS_ROOT_PATH=/home/rustfs
 
 # WebUI 端口 [必填] 
-PANEL_APP_PORT_HTTP=9000
+PANEL_APP_PORT_HTTP=9001
+
+# API 端口 [必填] 
+PANEL_APP_PORT_API=9000
 
 # 管理员账号 [必填] 
 RUSTFS_ACCESS_KEY=rustfsadmin
@@ -11,17 +14,8 @@ RUSTFS_ACCESS_KEY=rustfsadmin
 RUSTFS_SECRET_KEY=rustfsadmin
 
 # 域名 
-RUSTFS_SERVER_DOMAINS=127.0.0.1:9000
+RUSTFS_SERVER_DOMAINS=example.com
 
 # 启用控制台 [必填] 
 RUSTFS_CONSOLE_ENABLE=true
 
-# 自定义挂载目录 1 
-CUSTOM_MOUNT_DIRECTORY_1=
-
-# 自定义挂载目录 2 
-CUSTOM_MOUNT_DIRECTORY_2=
-
-# 自定义挂载目录 3 
-CUSTOM_MOUNT_DIRECTORY_3=
-

appstore/rustfs/latest/data.yml

@@ -7,7 +7,7 @@ additionalProperties:
       labelEn: Data persistence path
       required: true
       type: text
-    - default: 9000
+    - default: 9001
       edit: true
       envKey: PANEL_APP_PORT_HTTP
       labelZh: WebUI 端口
@@ -15,6 +15,14 @@ additionalProperties:
       required: true
       rule: paramPort
       type: number
+    - default: 9000
+      edit: true
+      envKey: PANEL_APP_PORT_API
+      labelZh: API 端口
+      labelEn: API port
+      required: true
+      rule: paramPort
+      type: number
     - default: "rustfsadmin"
       edit: true
       envKey: RUSTFS_ACCESS_KEY
@@ -29,7 +37,7 @@ additionalProperties:
       labelEn: Secret Key
       required: true
       type: password
-    - default: "127.0.0.1:9000"
+    - default: "example.com"
       edit: true
       envKey: RUSTFS_SERVER_DOMAINS
       labelZh: 域名
@@ -48,24 +56,3 @@ additionalProperties:
           value: "true"
         - label: 禁用
           value: "false"
-    - default: ""
-      edit: true
-      envKey: CUSTOM_MOUNT_DIRECTORY_1
-      labelEn: Custom mount directory 1
-      labelZh: 自定义挂载目录 1
-      required: false
-      type: text
-    - default: ""
-      edit: true
-      envKey: CUSTOM_MOUNT_DIRECTORY_2
-      labelEn: Custom mount directory 2
-      labelZh: 自定义挂载目录 2
-      required: false
-      type: text
-    - default: ""
-      edit: true
-      envKey: CUSTOM_MOUNT_DIRECTORY_3
-      labelEn: Custom mount directory 3
-      labelZh: 自定义挂载目录 3
-      required: false
-      type: text

appstore/rustfs/latest/docker-compose.yml

@@ -9,17 +9,40 @@ services:
     - .env
     environment:
     - TZ=Asia/Shanghai
-    - RUSTFS_ADDRESS=:9000
+    - RUSTFS_VOLUMES=/data/rustfs{0...3}
+    - RUSTFS_ADDRESS=0.0.0.0:9000
+    - RUSTFS_CONSOLE_ADDRESS=0.0.0.0:9001
+    - RUSTFS_CONSOLE_ENABLE=true
+    - RUSTFS_CORS_ALLOWED_ORIGINS=*
+    - RUSTFS_CONSOLE_CORS_ALLOWED_ORIGINS=*
+    - RUSTFS_OBS_LOGGER_LEVEL=info
+    - RUSTFS_TLS_PATH=/opt/tls
+    - RUSTFS_OBJECT_CACHE_ENABLE=true
+    - RUSTFS_OBJECT_CACHE_TTL_SECS=300
+    healthcheck:
+      interval: 30s
+      retries: 3
+      start_period: 40s
+      test:
+      - CMD
+      - sh
+      - -c
+      - curl -f http://127.0.0.1:9000/health && curl -f http://127.0.0.1:9001/rustfs/console/health
+      timeout: 10s
     image: rustfs/rustfs:latest
     labels:
       createdBy: Apps
     networks:
     - 1panel-network
     ports:
-    - ${PANEL_APP_PORT_HTTP}:9000
+    - ${PANEL_APP_PORT_API}:9000
+    - ${PANEL_APP_PORT_HTTP}:9001
     restart: always
+    security_opt:
+    - no-new-privileges:true
     volumes:
-    - ${RUSTFS_ROOT_PATH}/data:/etc/rustfs
-    - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1}
-    - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2}
-    - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3}
+    - ${RUSTFS_ROOT_PATH}/logs:/app/logs
+    - ${RUSTFS_ROOT_PATH}/data/rustfs0:/data/rustfs0
+    - ${RUSTFS_ROOT_PATH}/data/rustfs1:/data/rustfs1
+    - ${RUSTFS_ROOT_PATH}/data/rustfs2:/data/rustfs2
+    - ${RUSTFS_ROOT_PATH}/data/rustfs3:/data/rustfs3

appstore/rustfs/latest/scripts/init.sh

@@ -10,6 +10,17 @@ if [ -f .env ]; then
   echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
   echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
 
+
+  mkdir -p "$RUSTFS_ROOT_PATH"
+  mkdir -p "$RUSTFS_ROOT_PATH/logs"
+  mkdir -p "$RUSTFS_ROOT_PATH/data"
+  mkdir -p "$RUSTFS_ROOT_PATH/data/rustfs0"
+  mkdir -p "$RUSTFS_ROOT_PATH/data/rustfs1"
+  mkdir -p "$RUSTFS_ROOT_PATH/data/rustfs2"
+  mkdir -p "$RUSTFS_ROOT_PATH/data/rustfs3"
+
+  chown -R 10001:10001 "$RUSTFS_ROOT_PATH"
+
   echo "Check Finish."
 
 else

appstore/rustfs/latest/scripts/upgrade.sh

@@ -10,6 +10,8 @@ if [ -f .env ]; then
   echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
   echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
 
+  chown -R 10001:10001 "$RUSTFS_ROOT_PATH"
+
   echo "Check Finish."
 
 else

dockge/astrbot-napcat/docker-compose.yml

@@ -9,7 +9,7 @@ services:
     - .env
     environment:
     - TZ=Asia/Shanghai
-    image: soulter/astrbot:v4.20.0
+    image: soulter/astrbot:v4.20.1
     labels:
       createdBy: Apps
     networks:

dockge/astrbot/docker-compose.yml

@@ -9,7 +9,7 @@ services:
     - .env
     environment:
     - TZ=Asia/Shanghai
-    image: soulter/astrbot:v4.20.0
+    image: soulter/astrbot:v4.20.1
     labels:
       createdBy: Apps
     networks:

dockge/clouddrive2/docker-compose.yml

@@ -14,7 +14,7 @@ services:
     environment:
     - TZ=Asia/Shanghai
     - CLOUDDRIVE_HOME=/Config
-    image: cloudnas/clouddrive2:0.9.24
+    image: cloudnas/clouddrive2:1.0.1
     labels:
       createdBy: Apps
     networks:

dockge/dujiaonext/docker-compose.yml

@@ -14,7 +14,7 @@ services:
     - .env
     environment:
     - TZ=Asia/Shanghai
-    image: dujiaonext/admin:v0.1.0
+    image: dujiaonext/admin:v0.1.1
     networks:
     - dujiao-net
     ports:

dockge/ech0/docker-compose.yml

@@ -10,7 +10,7 @@ services:
     environment:
     - TZ=Asia/Shanghai
     - HTTPS_PROXY=${HTTP_PROXY}
-    image: sn0wl1n/ech0:v4.1.3
+    image: sn0wl1n/ech0:v3.1.4
     labels:
       createdBy: Apps
     networks:

dockge/ech0_4_1_4/docker-compose.yml

@@ -10,7 +10,7 @@ services:
     environment:
     - TZ=Asia/Shanghai
     - HTTPS_PROXY=${HTTP_PROXY}
-    image: sn0wl1n/ech0:v4.1.3
+    image: sn0wl1n/ech0:v4.1.4
     labels:
       createdBy: Apps
     networks: