From c078f8a8ae7e9c2a5857f50e9ebcbb9d8c589f5c Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Fri, 10 Jan 2025 06:27:27 +0000 Subject: [PATCH] Processed apps directory via GitHub Actions --- appstore/nodebb/3.12.2/.env | 4 ++-- appstore/nodebb/3.12.2/conf/setup.json | 3 --- appstore/nodebb/3.12.2/data.yml | 4 ++-- appstore/nodebb/3.12.2/docker-compose.yml | 25 ++++++++++++++++++++--- appstore/nodebb/3.12.2/scripts/init.sh | 4 ++-- appstore/nodebb/3.12.2/scripts/upgrade.sh | 2 ++ dockge/nodebb/.env | 4 ++-- dockge/nodebb/conf/setup.json | 3 --- dockge/nodebb/docker-compose.yml | 25 ++++++++++++++++++++--- 9 files changed, 54 insertions(+), 20 deletions(-) delete mode 100644 appstore/nodebb/3.12.2/conf/setup.json delete mode 100644 dockge/nodebb/conf/setup.json 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