Ms-Studio/appstore-1panel
Ms-Studio/appstore-1panel
1
0
Fork 0
mirror of https://github.com/QYG2297248353/appstore-1panel.git synced 2025-02-03 03:17:58 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

修复 nodedb 环境变量被覆盖

Browse Source 
Signed-off-by: Meng Sen <qyg2297248353@gmail.com>
This commit is contained in:
新疆萌森软件开发工作室 2025-01-13 13:37:59 +08:00
parent 3b99a7dd67
commit e388efcf16
4 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
apps/nodebb/3.12.2/conf/setup.json
View File

@ -1,23 +1,11 @@
{
"defaults": {
"mongo": {
"host": "mongo",
"port": 27017,
"database": "nodebb",
"username": "nodebb",
"password": "nodebb"
},
"redis": {
"host": "redis",
"port": 6379,
"database": 0
},
"postgres": {
"host": "postgres",
"port": 5432,
"database": "nodebb",
"username": "nodebb",
"password": "nodebb"
"$NODEBB_DB": {
"host": "$NODEBB_DB_HOST",
"port": $NODEBB_DB_PORT,
"database": "$NODEBB_DB_NAME",
"username": "$NODEBB_DB_USER",
"password": "$NODEBB_DB_PASSWORD"
}
}
}

9
apps/nodebb/3.12.2/docker-compose.yml
View File

@ -24,12 +24,3 @@ services:
- ${NODEBB_ROOT_PATH}/setup.json:/usr/src/app/setup.json
environment:
- TZ=Asia/Shanghai
- url=${NODEBB_URL}
- port=4567
- database=${NODEBB_DB}
- ${NODEBB_DB}_host=${NODEBB_DB_HOST}
- ${NODEBB_DB}_port=${NODEBB_DB_PORT}
- ${NODEBB_DB}_username=${NODEBB_DB_USERNAME}
- ${NODEBB_DB}_password=${NODEBB_DB_PASSWORD}
- ${NODEBB_DB}_database=${NODEBB_DB_DATABASE}
- ${NODEBB_DB}_ssl=${NODEBB_DB_SSL:-false}

26
apps/nodebb/3.12.2/scripts/init.sh
View File

@ -17,8 +17,32 @@ if [ -f .env ]; then
mkdir -p "$NODEBB_ROOT_PATH/uploads"
mkdir -p "$NODEBB_ROOT_PATH/config"
cp ./conf/setup.json "$NODEBB_ROOT_PATH/setup.json"
# setup-3 初始化参数配置
if [ -z "$NODEBB_DB_NAME" ]; then
NODEBB_DB_NAME="nodebb"
fi
if [ -z "$NODEBB_DB_USER" ]; then
NODEBB_DB_USER=""
fi
if [ -z "$NODEBB_DB_PASSWORD" ]; then
NODEBB_DB_PASSWORD=""
fi
SETUP_JSON_PATH="$NODEBB_ROOT_PATH/setup.json"
cp ./conf/setup.json "$SETUP_JSON_PATH"
sed -i "
s|\$NODEBB_DB_HOST|$NODEBB_DB_HOST|g;
s|\$NODEBB_DB_PORT|$NODEBB_DB_PORT|g;
s|\$NODEBB_DB_NAME|$NODEBB_DB_NAME|g;
s|\$NODEBB_DB_USER|$NODEBB_DB_USER|g;
s|\$NODEBB_DB_PASSWORD|$NODEBB_DB_PASSWORD|g;
s|\$NODEBB_DB|$NODEBB_DB|g
" "$SETUP_JSON_PATH"
# setup-4 update dir permissions
chown -R 1001:1001 "$NODEBB_ROOT_PATH"
chown -R 1001:1001 "$NODEBB_ROOT_PATH/node_modules"
chown -R 1001:1001 "$NODEBB_ROOT_PATH/build"

12
apps/nodebb/3.12.2/scripts/upgrade.sh
View File

@ -18,9 +18,19 @@ if [ -f .env ]; then
mkdir -p "$NODEBB_ROOT_PATH/config"
if [ ! -f "$NODEBB_ROOT_PATH/setup.json" ]; then
cp ./conf/setup.json "$NODEBB_ROOT_PATH/setup.json"
SETUP_JSON_PATH="$NODEBB_ROOT_PATH/setup.json"
cp ./conf/setup.json "$SETUP_JSON_PATH"
sed -i "
s|\$NODEBB_DB_HOST|$NODEBB_DB_HOST|g;
s|\$NODEBB_DB_PORT|$NODEBB_DB_PORT|g;
s|\$NODEBB_DB_NAME|$NODEBB_DB_NAME|g;
s|\$NODEBB_DB_USER|$NODEBB_DB_USER|g;
s|\$NODEBB_DB_PASSWORD|$NODEBB_DB_PASSWORD|g;
s|\$NODEBB_DB|$NODEBB_DB|g
" "$SETUP_JSON_PATH"
fi
# setup-3 update dir permissions
chown -R 1001:1001 "$NODEBB_ROOT_PATH"
chown -R 1001:1001 "$NODEBB_ROOT_PATH/node_modules"
chown -R 1001:1001 "$NODEBB_ROOT_PATH/build"