diff --git a/apps/ani-rss/1.1.218/data.yml b/apps/ani-rss/1.1.219/data.yml similarity index 100% rename from apps/ani-rss/1.1.218/data.yml rename to apps/ani-rss/1.1.219/data.yml diff --git a/apps/ani-rss/1.1.218/docker-compose.yml b/apps/ani-rss/1.1.219/docker-compose.yml similarity index 95% rename from apps/ani-rss/1.1.218/docker-compose.yml rename to apps/ani-rss/1.1.219/docker-compose.yml index 7eb380ae..a9b11379 100644 --- a/apps/ani-rss/1.1.218/docker-compose.yml +++ b/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" diff --git a/apps/ani-rss/1.1.218/envs/default.env b/apps/ani-rss/1.1.219/envs/default.env similarity index 100% rename from apps/ani-rss/1.1.218/envs/default.env rename to apps/ani-rss/1.1.219/envs/default.env diff --git a/apps/ani-rss/1.1.218/envs/global.env b/apps/ani-rss/1.1.219/envs/global.env similarity index 100% rename from apps/ani-rss/1.1.218/envs/global.env rename to apps/ani-rss/1.1.219/envs/global.env diff --git a/apps/ani-rss/1.1.218/scripts/init.sh b/apps/ani-rss/1.1.219/scripts/init.sh similarity index 100% rename from apps/ani-rss/1.1.218/scripts/init.sh rename to apps/ani-rss/1.1.219/scripts/init.sh diff --git a/apps/ani-rss/1.1.218/scripts/uninstall.sh b/apps/ani-rss/1.1.219/scripts/uninstall.sh similarity index 100% rename from apps/ani-rss/1.1.218/scripts/uninstall.sh rename to apps/ani-rss/1.1.219/scripts/uninstall.sh diff --git a/apps/ani-rss/1.1.218/scripts/upgrade.sh b/apps/ani-rss/1.1.219/scripts/upgrade.sh similarity index 100% rename from apps/ani-rss/1.1.218/scripts/upgrade.sh rename to apps/ani-rss/1.1.219/scripts/upgrade.sh diff --git a/apps/dozzle/8.10.1/data.yml b/apps/dozzle/8.10.2/data.yml similarity index 100% rename from apps/dozzle/8.10.1/data.yml rename to apps/dozzle/8.10.2/data.yml diff --git a/apps/dozzle/8.10.1/docker-compose.yml b/apps/dozzle/8.10.2/docker-compose.yml similarity index 95% rename from apps/dozzle/8.10.1/docker-compose.yml rename to apps/dozzle/8.10.2/docker-compose.yml index aa56acdf..29dd9385 100644 --- a/apps/dozzle/8.10.1/docker-compose.yml +++ b/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" diff --git a/apps/dozzle/8.10.1/envs/default.env b/apps/dozzle/8.10.2/envs/default.env similarity index 100% rename from apps/dozzle/8.10.1/envs/default.env rename to apps/dozzle/8.10.2/envs/default.env diff --git a/apps/dozzle/8.10.1/envs/global.env b/apps/dozzle/8.10.2/envs/global.env similarity index 100% rename from apps/dozzle/8.10.1/envs/global.env rename to apps/dozzle/8.10.2/envs/global.env diff --git a/apps/dozzle/8.10.1/scripts/init.sh b/apps/dozzle/8.10.2/scripts/init.sh similarity index 100% rename from apps/dozzle/8.10.1/scripts/init.sh rename to apps/dozzle/8.10.2/scripts/init.sh diff --git a/apps/dozzle/8.10.1/scripts/uninstall.sh b/apps/dozzle/8.10.2/scripts/uninstall.sh similarity index 100% rename from apps/dozzle/8.10.1/scripts/uninstall.sh rename to apps/dozzle/8.10.2/scripts/uninstall.sh diff --git a/apps/dozzle/8.10.1/scripts/upgrade.sh b/apps/dozzle/8.10.2/scripts/upgrade.sh similarity index 100% rename from apps/dozzle/8.10.1/scripts/upgrade.sh rename to apps/dozzle/8.10.2/scripts/upgrade.sh diff --git a/apps/gitea/1.23.0/config/app.example.ini b/apps/gitea/1.23.1/config/app.example.ini similarity index 100% rename from apps/gitea/1.23.0/config/app.example.ini rename to apps/gitea/1.23.1/config/app.example.ini diff --git a/apps/gitea/1.23.0/data.yml b/apps/gitea/1.23.1/data.yml similarity index 100% rename from apps/gitea/1.23.0/data.yml rename to apps/gitea/1.23.1/data.yml diff --git a/apps/gitea/1.23.0/docker-compose.yml b/apps/gitea/1.23.1/docker-compose.yml similarity index 97% rename from apps/gitea/1.23.0/docker-compose.yml rename to apps/gitea/1.23.1/docker-compose.yml index 07794813..4b9db73d 100644 --- a/apps/gitea/1.23.0/docker-compose.yml +++ b/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" diff --git a/apps/gitea/1.23.0/envs/default.env b/apps/gitea/1.23.1/envs/default.env similarity index 100% rename from apps/gitea/1.23.0/envs/default.env rename to apps/gitea/1.23.1/envs/default.env diff --git a/apps/gitea/1.23.0/envs/gitea.env b/apps/gitea/1.23.1/envs/gitea.env similarity index 100% rename from apps/gitea/1.23.0/envs/gitea.env rename to apps/gitea/1.23.1/envs/gitea.env diff --git a/apps/gitea/1.23.0/envs/global.env b/apps/gitea/1.23.1/envs/global.env similarity index 100% rename from apps/gitea/1.23.0/envs/global.env rename to apps/gitea/1.23.1/envs/global.env diff --git a/apps/gitea/1.23.0/scripts/init.sh b/apps/gitea/1.23.1/scripts/init.sh similarity index 100% rename from apps/gitea/1.23.0/scripts/init.sh rename to apps/gitea/1.23.1/scripts/init.sh diff --git a/apps/gitea/1.23.0/scripts/uninstall.sh b/apps/gitea/1.23.1/scripts/uninstall.sh similarity index 100% rename from apps/gitea/1.23.0/scripts/uninstall.sh rename to apps/gitea/1.23.1/scripts/uninstall.sh diff --git a/apps/gitea/1.23.0/scripts/upgrade.sh b/apps/gitea/1.23.1/scripts/upgrade.sh similarity index 100% rename from apps/gitea/1.23.0/scripts/upgrade.sh rename to apps/gitea/1.23.1/scripts/upgrade.sh diff --git a/apps/nezha-dash/2.1.3/data.yml b/apps/nezha-dash/2.2.0/data.yml similarity index 100% rename from apps/nezha-dash/2.1.3/data.yml rename to apps/nezha-dash/2.2.0/data.yml diff --git a/apps/nezha-dash/2.1.3/docker-compose.yml b/apps/nezha-dash/2.2.0/docker-compose.yml similarity index 95% rename from apps/nezha-dash/2.1.3/docker-compose.yml rename to apps/nezha-dash/2.2.0/docker-compose.yml index 949a2b91..024837d8 100644 --- a/apps/nezha-dash/2.1.3/docker-compose.yml +++ b/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" diff --git a/apps/nezha-dash/2.1.3/envs/default.env b/apps/nezha-dash/2.2.0/envs/default.env similarity index 100% rename from apps/nezha-dash/2.1.3/envs/default.env rename to apps/nezha-dash/2.2.0/envs/default.env diff --git a/apps/nezha-dash/2.1.3/envs/global.env b/apps/nezha-dash/2.2.0/envs/global.env similarity index 100% rename from apps/nezha-dash/2.1.3/envs/global.env rename to apps/nezha-dash/2.2.0/envs/global.env diff --git a/apps/nezha-dash/2.1.3/scripts/init.sh b/apps/nezha-dash/2.2.0/scripts/init.sh similarity index 100% rename from apps/nezha-dash/2.1.3/scripts/init.sh rename to apps/nezha-dash/2.2.0/scripts/init.sh diff --git a/apps/nezha-dash/2.1.3/scripts/uninstall.sh b/apps/nezha-dash/2.2.0/scripts/uninstall.sh similarity index 100% rename from apps/nezha-dash/2.1.3/scripts/uninstall.sh rename to apps/nezha-dash/2.2.0/scripts/uninstall.sh diff --git a/apps/nezha-dash/2.1.3/scripts/upgrade.sh b/apps/nezha-dash/2.2.0/scripts/upgrade.sh similarity index 100% rename from apps/nezha-dash/2.1.3/scripts/upgrade.sh rename to apps/nezha-dash/2.2.0/scripts/upgrade.sh diff --git a/apps/rsshub/2025-01-09/data.yml b/apps/rsshub/2025-01-10/data.yml similarity index 100% rename from apps/rsshub/2025-01-09/data.yml rename to apps/rsshub/2025-01-10/data.yml diff --git a/apps/rsshub/2025-01-09/docker-compose.yml b/apps/rsshub/2025-01-10/docker-compose.yml similarity index 97% rename from apps/rsshub/2025-01-09/docker-compose.yml rename to apps/rsshub/2025-01-10/docker-compose.yml index 45e254c0..7cb5a084 100644 --- a/apps/rsshub/2025-01-09/docker-compose.yml +++ b/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 diff --git a/apps/rsshub/2025-01-09/envs/default.env b/apps/rsshub/2025-01-10/envs/default.env similarity index 100% rename from apps/rsshub/2025-01-09/envs/default.env rename to apps/rsshub/2025-01-10/envs/default.env diff --git a/apps/rsshub/2025-01-09/envs/global.env b/apps/rsshub/2025-01-10/envs/global.env similarity index 100% rename from apps/rsshub/2025-01-09/envs/global.env rename to apps/rsshub/2025-01-10/envs/global.env diff --git a/apps/rsshub/2025-01-09/scripts/init.sh b/apps/rsshub/2025-01-10/scripts/init.sh similarity index 100% rename from apps/rsshub/2025-01-09/scripts/init.sh rename to apps/rsshub/2025-01-10/scripts/init.sh diff --git a/apps/rsshub/2025-01-09/scripts/uninstall.sh b/apps/rsshub/2025-01-10/scripts/uninstall.sh similarity index 100% rename from apps/rsshub/2025-01-09/scripts/uninstall.sh rename to apps/rsshub/2025-01-10/scripts/uninstall.sh diff --git a/apps/rsshub/2025-01-09/scripts/upgrade.sh b/apps/rsshub/2025-01-10/scripts/upgrade.sh similarity index 100% rename from apps/rsshub/2025-01-09/scripts/upgrade.sh rename to apps/rsshub/2025-01-10/scripts/upgrade.sh diff --git a/appstore/nodebb/3.12.2/.env b/appstore/nodebb/3.12.2/.env index 0f77ff34..15fce654 100644 --- a/appstore/nodebb/3.12.2/.env +++ b/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= diff --git a/appstore/nodebb/3.12.2/conf/setup.json b/appstore/nodebb/3.12.2/conf/setup.json deleted file mode 100644 index bc85928b..00000000 --- a/appstore/nodebb/3.12.2/conf/setup.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "defaults": {} -} diff --git a/appstore/nodebb/3.12.2/data.yml b/appstore/nodebb/3.12.2/data.yml index 88f81774..fe675b3f 100644 --- a/appstore/nodebb/3.12.2/data.yml +++ b/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 diff --git a/appstore/nodebb/3.12.2/docker-compose.yml b/appstore/nodebb/3.12.2/docker-compose.yml index cbc69642..e2f9814c 100644 --- a/appstore/nodebb/3.12.2/docker-compose.yml +++ b/appstore/nodebb/3.12.2/docker-compose.yml @@ -9,8 +9,28 @@ services: - .env environment: - TZ=Asia/Shanghai - - NODEBB_PORT=4567 - - NODEBB_URL=http://127.0.0.1:4567 + - bind_address=0.0.0.0 + - 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 diff --git a/appstore/nodebb/3.12.2/scripts/init.sh b/appstore/nodebb/3.12.2/scripts/init.sh index 62ec83c2..29d36327 100644 --- a/appstore/nodebb/3.12.2/scripts/init.sh +++ b/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" diff --git a/appstore/nodebb/3.12.2/scripts/upgrade.sh b/appstore/nodebb/3.12.2/scripts/upgrade.sh index 388ae28f..29d36327 100644 --- a/appstore/nodebb/3.12.2/scripts/upgrade.sh +++ b/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" diff --git a/dockge/nodebb/.env b/dockge/nodebb/.env index 0f77ff34..15fce654 100644 --- a/dockge/nodebb/.env +++ b/dockge/nodebb/.env @@ -25,9 +25,9 @@ NODEBB_DB_PORT=5432 # 数据库 名称 [必填] NODEBB_DB_NAME=nodebb -# 数据库 用户名 [必填] +# 数据库 用户名 NODEBB_DB_USER=nodebb -# 数据库 密码 [必填] +# 数据库 密码 NODEBB_DB_PASSWORD= diff --git a/dockge/nodebb/conf/setup.json b/dockge/nodebb/conf/setup.json deleted file mode 100644 index bc85928b..00000000 --- a/dockge/nodebb/conf/setup.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "defaults": {} -} diff --git a/dockge/nodebb/docker-compose.yml b/dockge/nodebb/docker-compose.yml index cbc69642..e2f9814c 100644 --- a/dockge/nodebb/docker-compose.yml +++ b/dockge/nodebb/docker-compose.yml @@ -9,8 +9,28 @@ services: - .env environment: - TZ=Asia/Shanghai - - NODEBB_PORT=4567 - - NODEBB_URL=http://127.0.0.1:4567 + - bind_address=0.0.0.0 + - 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