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

apps/ani-rss/1.1.219/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   ani-rss:
-    image: wushuo894/ani-rss:v1.1.218
+    image: wushuo894/ani-rss:v1.1.219
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"

apps/dozzle/8.10.2/docker-compose.yml

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

apps/gitea/1.23.1/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   gitea:
-    image: gitea/gitea:1.23.0
+    image: gitea/gitea:1.23.1
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"

apps/nezha-dash/2.2.0/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   nezha-dash:
-    image: hamster1963/nezha-dash:v2.1.3
+    image: hamster1963/nezha-dash:v2.2.0
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"

apps/rsshub/2025-01-10/docker-compose.yml

@@ -23,7 +23,7 @@ services:
       timeout: 10s
       retries: 3
   rsshub:
-    image: diygod/rsshub:2025-01-09
+    image: diygod/rsshub:2025-01-10
     container_name: rsshub-${CONTAINER_NAME}
     depends_on:
       - browserless

appstore/nodebb/3.12.2/.env

@@ -25,9 +25,9 @@ NODEBB_DB_PORT=5432
 # 数据库 名称 [必填] 
 NODEBB_DB_NAME=nodebb
 
-# 数据库 用户名 [必填] 
+# 数据库 用户名 
 NODEBB_DB_USER=nodebb
 
-# 数据库 密码 [必填] 
+# 数据库 密码 
 NODEBB_DB_PASSWORD=
 

appstore/nodebb/3.12.2/conf/setup.json

@@ -1,3 +0,0 @@
-{
-  "defaults": {}
-}

appstore/nodebb/3.12.2/data.yml

@@ -78,7 +78,7 @@ additionalProperties:
       envKey: NODEBB_DB_USER
       labelZh: 数据库 用户名
       labelEn: Database Username
-      required: true
+      required: false
       type: text
     - default: ""
       edit: true
@@ -86,6 +86,6 @@ additionalProperties:
       labelZh: 数据库 密码
       labelEn: Database Password
       random: true
-      required: true
+      required: false
       rule: paramComplexity
       type: password

appstore/nodebb/3.12.2/docker-compose.yml

@@ -9,8 +9,28 @@ services:
     - .env
     environment:
     - TZ=Asia/Shanghai
-    - NODEBB_PORT=4567
+    - bind_address=0.0.0.0
-    - NODEBB_URL=http://127.0.0.1:4567
+    - port=4567
+    - url=http://127.0.0.1:4567
+    - admin__email=${NODEBB_ADMIN_EMAIL}
+    - admin__username=${NODEBB_ADMIN_USERNAME}
+    - admin__password=${NODEBB_ADMIN_PASSWORD}
+    - database=${NODEBB_DB}
+    - redis__host=${NODEBB_DB_HOST}
+    - redis__port=${NODEBB_DB_PORT}
+    - redis__database=${NODEBB_DB_NAME}
+    - redis__username=${NODEBB_DB_USER}
+    - redis__password=${NODEBB_DB_PASSWORD}
+    - postgres__host=${NODEBB_DB_HOST}
+    - postgres__port=${NODEBB_DB_PORT}
+    - postgres__database=${NODEBB_DB_NAME}
+    - postgres__username=${NODEBB_DB_USER}
+    - postgres__password=${NODEBB_DB_PASSWORD}
+    - mongo__host=${NODEBB_DB_HOST}
+    - mongo__port=${NODEBB_DB_PORT}
+    - mongo__database=${NODEBB_DB_NAME}
+    - mongo__username=${NODEBB_DB_USER}
+    - mongo__password=${NODEBB_DB_PASSWORD}
     image: ghcr.io/nodebb/nodebb:3.12.2
     labels:
       createdBy: Apps
@@ -24,4 +44,3 @@ services:
     - ${NODEBB_ROOT_PATH}/build:/usr/src/app/build
     - ${NODEBB_ROOT_PATH}/uploads:/usr/src/app/public/uploads
     - ${NODEBB_ROOT_PATH}/config:/opt/config
-    - ${NODEBB_ROOT_PATH}/setup.json:/usr/src/app/setup.json

appstore/nodebb/3.12.2/scripts/init.sh

@@ -12,13 +12,13 @@ if [ -f .env ]; then
 
   # setup-2 update dir permissions
   mkdir -p "$NODEBB_ROOT_PATH"
+  mkdir -p "$NODEBB_ROOT_PATH/node_modules"
   mkdir -p "$NODEBB_ROOT_PATH/build"
   mkdir -p "$NODEBB_ROOT_PATH/uploads"
   mkdir -p "$NODEBB_ROOT_PATH/config"
 
-  cp ./conf/setup.json "$NODEBB_ROOT_PATH/setup.json"
-
   chown -R 1001:1001 "$NODEBB_ROOT_PATH"
+  chown -R 1001:1001 "$NODEBB_ROOT_PATH/node_modules"
   chown -R 1001:1001 "$NODEBB_ROOT_PATH/build"
   chown -R 1001:1001 "$NODEBB_ROOT_PATH/uploads"
   chown -R 1001:1001 "$NODEBB_ROOT_PATH/config"

appstore/nodebb/3.12.2/scripts/upgrade.sh

@@ -12,11 +12,13 @@ if [ -f .env ]; then
 
   # setup-2 update dir permissions
   mkdir -p "$NODEBB_ROOT_PATH"
+  mkdir -p "$NODEBB_ROOT_PATH/node_modules"
   mkdir -p "$NODEBB_ROOT_PATH/build"
   mkdir -p "$NODEBB_ROOT_PATH/uploads"
   mkdir -p "$NODEBB_ROOT_PATH/config"
 
   chown -R 1001:1001 "$NODEBB_ROOT_PATH"
+  chown -R 1001:1001 "$NODEBB_ROOT_PATH/node_modules"
   chown -R 1001:1001 "$NODEBB_ROOT_PATH/build"
   chown -R 1001:1001 "$NODEBB_ROOT_PATH/uploads"
   chown -R 1001:1001 "$NODEBB_ROOT_PATH/config"

dockge/nodebb/.env

@@ -25,9 +25,9 @@ NODEBB_DB_PORT=5432
 # 数据库 名称 [必填] 
 NODEBB_DB_NAME=nodebb
 
-# 数据库 用户名 [必填] 
+# 数据库 用户名 
 NODEBB_DB_USER=nodebb
 
-# 数据库 密码 [必填] 
+# 数据库 密码 
 NODEBB_DB_PASSWORD=
 

dockge/nodebb/conf/setup.json

@@ -1,3 +0,0 @@
-{
-  "defaults": {}
-}

dockge/nodebb/docker-compose.yml

@@ -9,8 +9,28 @@ services:
     - .env
     environment:
     - TZ=Asia/Shanghai
-    - NODEBB_PORT=4567
+    - bind_address=0.0.0.0
-    - NODEBB_URL=http://127.0.0.1:4567
+    - port=4567
+    - url=http://127.0.0.1:4567
+    - admin__email=${NODEBB_ADMIN_EMAIL}
+    - admin__username=${NODEBB_ADMIN_USERNAME}
+    - admin__password=${NODEBB_ADMIN_PASSWORD}
+    - database=${NODEBB_DB}
+    - redis__host=${NODEBB_DB_HOST}
+    - redis__port=${NODEBB_DB_PORT}
+    - redis__database=${NODEBB_DB_NAME}
+    - redis__username=${NODEBB_DB_USER}
+    - redis__password=${NODEBB_DB_PASSWORD}
+    - postgres__host=${NODEBB_DB_HOST}
+    - postgres__port=${NODEBB_DB_PORT}
+    - postgres__database=${NODEBB_DB_NAME}
+    - postgres__username=${NODEBB_DB_USER}
+    - postgres__password=${NODEBB_DB_PASSWORD}
+    - mongo__host=${NODEBB_DB_HOST}
+    - mongo__port=${NODEBB_DB_PORT}
+    - mongo__database=${NODEBB_DB_NAME}
+    - mongo__username=${NODEBB_DB_USER}
+    - mongo__password=${NODEBB_DB_PASSWORD}
     image: ghcr.io/nodebb/nodebb:3.12.2
     labels:
       createdBy: Apps
@@ -24,4 +44,3 @@ services:
     - ${NODEBB_ROOT_PATH}/build:/usr/src/app/build
     - ${NODEBB_ROOT_PATH}/uploads:/usr/src/app/public/uploads
     - ${NODEBB_ROOT_PATH}/config:/opt/config
-    - ${NODEBB_ROOT_PATH}/setup.json:/usr/src/app/setup.json