From 2cdc2bf4e058d75d881212b05c429177335fbe19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E6=A3=AE?= Date: Tue, 13 Aug 2024 18:12:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=88=B1=E5=BD=B1CMS=20=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 萌森 --- apps/iycms/3.3.44/docker-compose.yml | 3 +++ apps/iycms/3.3.44/scripts/init.sh | 4 ++-- apps/iycms/3.3.44/scripts/upgrade.sh | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/iycms/3.3.44/docker-compose.yml b/apps/iycms/3.3.44/docker-compose.yml index 35f0ca85..565cf892 100644 --- a/apps/iycms/3.3.44/docker-compose.yml +++ b/apps/iycms/3.3.44/docker-compose.yml @@ -16,6 +16,9 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 - ${PANEL_APP_PORT_ADMIN}:21007 + env_file: + - /etc/1panel/envs/global.env + - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${IYCMS_ROOT_PATH}/data:/app/iycms/data - ${IYCMS_ROOT_PATH}/config/config.conf:/app/iycms/config.conf diff --git a/apps/iycms/3.3.44/scripts/init.sh b/apps/iycms/3.3.44/scripts/init.sh index 96411a4f..73da5365 100644 --- a/apps/iycms/3.3.44/scripts/init.sh +++ b/apps/iycms/3.3.44/scripts/init.sh @@ -8,8 +8,8 @@ if [ -f .env ]; then sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - if [ ! -d ${IYCMS_ROOT_PATH}/config ]; then - cp -r ./config ${IYCMS_ROOT_PATH}/config + if [ ! -d "$IYCMS_ROOT_PATH/config" ]; then + cp -r ./config "$IYCMS_ROOT_PATH/config" fi echo "Check Finish." diff --git a/apps/iycms/3.3.44/scripts/upgrade.sh b/apps/iycms/3.3.44/scripts/upgrade.sh index 96411a4f..73da5365 100644 --- a/apps/iycms/3.3.44/scripts/upgrade.sh +++ b/apps/iycms/3.3.44/scripts/upgrade.sh @@ -8,8 +8,8 @@ if [ -f .env ]; then sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - if [ ! -d ${IYCMS_ROOT_PATH}/config ]; then - cp -r ./config ${IYCMS_ROOT_PATH}/config + if [ ! -d "$IYCMS_ROOT_PATH/config" ]; then + cp -r ./config "$IYCMS_ROOT_PATH/config" fi echo "Check Finish."