diff --git a/acg-faka/1.3.8/docker-compose.yml b/acg-faka/1.3.8/docker-compose.yml index 0906ac014..9c136e5df 100644 --- a/acg-faka/1.3.8/docker-compose.yml +++ b/acg-faka/1.3.8/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ACG_FAKA_ROOT_PATH}/data:/var/www/html diff --git a/acg-faka/1.3.8/scripts/init.sh b/acg-faka/1.3.8/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/acg-faka/1.3.8/scripts/init.sh +++ b/acg-faka/1.3.8/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/acg-faka/1.3.8/scripts/upgrade.sh b/acg-faka/1.3.8/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/acg-faka/1.3.8/scripts/upgrade.sh +++ b/acg-faka/1.3.8/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/alist-aria2/3.40.0/docker-compose.yml b/alist-aria2/3.40.0/docker-compose.yml index 1e03e01fd..c27227fa8 100644 --- a/alist-aria2/3.40.0/docker-compose.yml +++ b/alist-aria2/3.40.0/docker-compose.yml @@ -13,7 +13,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5244 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ALIST_ROOT_PATH}/data:/opt/alist/data diff --git a/alist-aria2/3.40.0/scripts/init.sh b/alist-aria2/3.40.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/alist-aria2/3.40.0/scripts/init.sh +++ b/alist-aria2/3.40.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/alist-aria2/3.40.0/scripts/upgrade.sh b/alist-aria2/3.40.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/alist-aria2/3.40.0/scripts/upgrade.sh +++ b/alist-aria2/3.40.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/alist-ffmpeg/3.40.0/docker-compose.yml b/alist-ffmpeg/3.40.0/docker-compose.yml index 7c064af68..76fcfb8ca 100644 --- a/alist-ffmpeg/3.40.0/docker-compose.yml +++ b/alist-ffmpeg/3.40.0/docker-compose.yml @@ -13,7 +13,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5244 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ALIST_ROOT_PATH}/data:/opt/alist/data diff --git a/alist-ffmpeg/3.40.0/scripts/init.sh b/alist-ffmpeg/3.40.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/alist-ffmpeg/3.40.0/scripts/init.sh +++ b/alist-ffmpeg/3.40.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/alist-ffmpeg/3.40.0/scripts/upgrade.sh b/alist-ffmpeg/3.40.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/alist-ffmpeg/3.40.0/scripts/upgrade.sh +++ b/alist-ffmpeg/3.40.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/alist/3.40.0/docker-compose.yml b/alist/3.40.0/docker-compose.yml index 9f247544d..4e708409c 100644 --- a/alist/3.40.0/docker-compose.yml +++ b/alist/3.40.0/docker-compose.yml @@ -13,7 +13,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5244 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ALIST_ROOT_PATH}/data:/opt/alist/data diff --git a/alist/3.40.0/scripts/init.sh b/alist/3.40.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/alist/3.40.0/scripts/init.sh +++ b/alist/3.40.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/alist/3.40.0/scripts/upgrade.sh b/alist/3.40.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/alist/3.40.0/scripts/upgrade.sh +++ b/alist/3.40.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/ani-rss/1.1.202/docker-compose.yml b/ani-rss/1.1.202/docker-compose.yml index 809143e0e..acc595a83 100644 --- a/ani-rss/1.1.202/docker-compose.yml +++ b/ani-rss/1.1.202/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:7789 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ANI_RSS_ROOT_PATH}/config:/config diff --git a/ani-rss/1.1.202/scripts/init.sh b/ani-rss/1.1.202/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/ani-rss/1.1.202/scripts/init.sh +++ b/ani-rss/1.1.202/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/ani-rss/1.1.202/scripts/upgrade.sh b/ani-rss/1.1.202/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/ani-rss/1.1.202/scripts/upgrade.sh +++ b/ani-rss/1.1.202/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/ani-rss/README.md b/ani-rss/README.md index b7f5eb97d..7d4495874 100644 --- a/ani-rss/README.md +++ b/ani-rss/README.md @@ -2,7 +2,7 @@ 自动追番、订阅、下载 蜜柑RSS动漫 -![Dockge](https://file.lifebus.top/imgs/ani_orss_cover.png) +![ANI-RSS](https://file.lifebus.top/imgs/ani_orss_cover.png) ![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) diff --git a/artalk/2.9.1/docker-compose.yml b/artalk/2.9.1/docker-compose.yml index 3662c36d2..65fc901b5 100644 --- a/artalk/2.9.1/docker-compose.yml +++ b/artalk/2.9.1/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:23366 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ARTALK_ROOT_PATH}/data:/data diff --git a/artalk/2.9.1/scripts/init.sh b/artalk/2.9.1/scripts/init.sh index 2b0096c5b..5e9dcca05 100644 --- a/artalk/2.9.1/scripts/init.sh +++ b/artalk/2.9.1/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env DATA_DIR="$ARTALK_ROOT_PATH/data" diff --git a/artalk/2.9.1/scripts/upgrade.sh b/artalk/2.9.1/scripts/upgrade.sh index 2b0096c5b..5e9dcca05 100644 --- a/artalk/2.9.1/scripts/upgrade.sh +++ b/artalk/2.9.1/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env DATA_DIR="$ARTALK_ROOT_PATH/data" diff --git a/auto-lady/1.1.202/docker-compose.yml b/auto-lady/1.1.202/docker-compose.yml index 69613b1b0..54016fad6 100644 --- a/auto-lady/1.1.202/docker-compose.yml +++ b/auto-lady/1.1.202/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${AUTO_LADY_ROOT_PATH}/config:/data diff --git a/auto-lady/1.1.202/scripts/init.sh b/auto-lady/1.1.202/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/auto-lady/1.1.202/scripts/init.sh +++ b/auto-lady/1.1.202/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/auto-lady/1.1.202/scripts/upgrade.sh b/auto-lady/1.1.202/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/auto-lady/1.1.202/scripts/upgrade.sh +++ b/auto-lady/1.1.202/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/auto-lady/README.md b/auto-lady/README.md index ba461b045..9f9b42551 100644 --- a/auto-lady/README.md +++ b/auto-lady/README.md @@ -2,7 +2,7 @@ 自动化订阅AV影片 -![Dockge](https://file.lifebus.top/imgs/autolady_cover.png) +![AutoLady](https://file.lifebus.top/imgs/autolady_cover.png) ![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) diff --git a/baota/9.0/docker-compose.yml b/baota/9.0/docker-compose.yml index ac9b19555..41405008a 100644 --- a/baota/9.0/docker-compose.yml +++ b/baota/9.0/docker-compose.yml @@ -19,7 +19,7 @@ services: - ${PANEL_APP_PORT_MYSQL}:3306 - ${PANEL_APP_PORT_PHPADMIN}:888 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${BAOTA_ROOT_PATH}/wwwroot:/www/wwwroot diff --git a/baota/9.0/scripts/init.sh b/baota/9.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/baota/9.0/scripts/init.sh +++ b/baota/9.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/baota/9.0/scripts/upgrade.sh b/baota/9.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/baota/9.0/scripts/upgrade.sh +++ b/baota/9.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/bark/2.1.5/docker-compose.yml b/bark/2.1.5/docker-compose.yml index dee00ec1c..2621737ff 100644 --- a/bark/2.1.5/docker-compose.yml +++ b/bark/2.1.5/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8080 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${BARK_ROOT_PATH}/data:/data diff --git a/bark/2.1.5/scripts/init.sh b/bark/2.1.5/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/bark/2.1.5/scripts/init.sh +++ b/bark/2.1.5/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/bark/2.1.5/scripts/upgrade.sh b/bark/2.1.5/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/bark/2.1.5/scripts/upgrade.sh +++ b/bark/2.1.5/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/bitmagnet/0.9.5/docker-compose.yml b/bitmagnet/0.9.5/docker-compose.yml index 3cddf4ae0..3da4583ed 100644 --- a/bitmagnet/0.9.5/docker-compose.yml +++ b/bitmagnet/0.9.5/docker-compose.yml @@ -19,7 +19,7 @@ services: - ${PANEL_APP_PORT_BT}:3334/tcp - ${PANEL_APP_PORT_BT}:3334/udp env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${BITMAGNET_ROOT_PATH}/config:/root/.config/bitmagnet diff --git a/bitmagnet/0.9.5/scripts/init.sh b/bitmagnet/0.9.5/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/bitmagnet/0.9.5/scripts/init.sh +++ b/bitmagnet/0.9.5/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/bitmagnet/0.9.5/scripts/upgrade.sh b/bitmagnet/0.9.5/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/bitmagnet/0.9.5/scripts/upgrade.sh +++ b/bitmagnet/0.9.5/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/casdoor/1.758.0/docker-compose.yml b/casdoor/1.758.0/docker-compose.yml index 656ad3e5f..b60ed2b9d 100644 --- a/casdoor/1.758.0/docker-compose.yml +++ b/casdoor/1.758.0/docker-compose.yml @@ -14,8 +14,8 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8000 env_file: - - /etc/1panel/envs/global.env - - /etc/1panel/envs/casdoor/casdoor.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} + - ${APP_ENV_FILE:-/etc/1panel/envs/casdoor/casdoor.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${CASDOOR_ROOT_PATH}/files:/files diff --git a/casdoor/1.758.0/envs/casdoor.env b/casdoor/1.758.0/envs/casdoor.env new file mode 100644 index 000000000..cb7db866a --- /dev/null +++ b/casdoor/1.758.0/envs/casdoor.env @@ -0,0 +1,31 @@ +appname=casdoor +httpport=8000 +runmode=prod +copyrequestbody=true +driverName=mysql +dataSourceName= +dbName=casdoor +tableNamePrefix= +showSql=false +redisEndpoint= +defaultStorageProvider= +isCloudIntranet=false +authState=casdoor +socks5Proxy= +verificationCodeTimeout=10 +initScore=0 +logPostOnly=true +isUsernameLowered=false +origin= +originFrontend= +staticBaseUrl=https://cdn.casbin.org +isDemoMode=false +batchSize=100 +enableGzip=true +ldapServerPort=389 +radiusServerPort=1812 +radiusSecret=secret +quota={"organization": -1, "user": -1, "application": -1, "provider": -1} +logConfig={"filename": "logs/casdoor.log", "maxdays":99999, "perm":"0770"} +initDataFil="./init_data.json" +frontendBaseDi="../casdoor" diff --git a/casdoor/1.758.0/envs/default.env b/casdoor/1.758.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/casdoor/1.758.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/casdoor/1.758.0/envs/global.env b/casdoor/1.758.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/casdoor/1.758.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/casdoor/1.758.0/scripts/init.sh b/casdoor/1.758.0/scripts/init.sh index dea3fb17b..cbf317ef5 100644 --- a/casdoor/1.758.0/scripts/init.sh +++ b/casdoor/1.758.0/scripts/init.sh @@ -6,7 +6,11 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + sed -i '/^APP_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + echo "APP_ENV_FILE=${CURRENT_DIR}/envs/casdoor.env" >> .env if [ "$DB_TYPE" == "mysql" ]; then echo "dataSourceName=$DB_USER:$DB_PASSWD@tcp($DB_HOSTNAME:$DB_PORT)/" >> .env diff --git a/casdoor/1.758.0/scripts/upgrade.sh b/casdoor/1.758.0/scripts/upgrade.sh index 77b849120..e32cd1c69 100644 --- a/casdoor/1.758.0/scripts/upgrade.sh +++ b/casdoor/1.758.0/scripts/upgrade.sh @@ -6,7 +6,11 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + sed -i '/^APP_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + echo "APP_ENV_FILE=${CURRENT_DIR}/envs/casdoor.env" >> .env echo "Check Finish." diff --git a/certimate/0.2.21/docker-compose.yml b/certimate/0.2.21/docker-compose.yml index 92e2ae1f8..0f5f56280 100644 --- a/certimate/0.2.21/docker-compose.yml +++ b/certimate/0.2.21/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8090 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${CERTIMATE_ROOT_PATH}/data:/app/pb_data diff --git a/certimate/0.2.21/scripts/init.sh b/certimate/0.2.21/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/certimate/0.2.21/scripts/init.sh +++ b/certimate/0.2.21/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/certimate/0.2.21/scripts/upgrade.sh b/certimate/0.2.21/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/certimate/0.2.21/scripts/upgrade.sh +++ b/certimate/0.2.21/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/cookie-cloud/latest/docker-compose.yml b/cookie-cloud/latest/docker-compose.yml index 60adfef91..18e45935b 100644 --- a/cookie-cloud/latest/docker-compose.yml +++ b/cookie-cloud/latest/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8088 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${COOKIECLOUD_ROOT_PATH}/data:/data/api/data diff --git a/cookie-cloud/latest/scripts/init.sh b/cookie-cloud/latest/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/cookie-cloud/latest/scripts/init.sh +++ b/cookie-cloud/latest/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/cookie-cloud/latest/scripts/upgrade.sh b/cookie-cloud/latest/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/cookie-cloud/latest/scripts/upgrade.sh +++ b/cookie-cloud/latest/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/deeplx/0.9.8.3/docker-compose.yml b/deeplx/0.9.8.3/docker-compose.yml index 537654614..9bb2f2fe1 100644 --- a/deeplx/0.9.8.3/docker-compose.yml +++ b/deeplx/0.9.8.3/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:1188 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - PORT=1188 diff --git a/deeplx/0.9.8.3/scripts/init.sh b/deeplx/0.9.8.3/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/deeplx/0.9.8.3/scripts/init.sh +++ b/deeplx/0.9.8.3/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/deeplx/0.9.8.3/scripts/upgrade.sh b/deeplx/0.9.8.3/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/deeplx/0.9.8.3/scripts/upgrade.sh +++ b/deeplx/0.9.8.3/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/dockge/1.4.2/docker-compose.yml b/dockge/1.4.2/docker-compose.yml index 808d63181..aa93e4167 100644 --- a/dockge/1.4.2/docker-compose.yml +++ b/dockge/1.4.2/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5001 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${DOCKGE_ROOT_PATH}/data:/app/data diff --git a/dockge/1.4.2/scripts/init.sh b/dockge/1.4.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/dockge/1.4.2/scripts/init.sh +++ b/dockge/1.4.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/dockge/1.4.2/scripts/upgrade.sh b/dockge/1.4.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/dockge/1.4.2/scripts/upgrade.sh +++ b/dockge/1.4.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/dozzle/8.8.2/docker-compose.yml b/dozzle/8.8.2/docker-compose.yml index 5cf7d2fc1..162714bea 100644 --- a/dozzle/8.8.2/docker-compose.yml +++ b/dozzle/8.8.2/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8080 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} healthcheck: test: [ "CMD", "/dozzle", "healthcheck" ] diff --git a/dozzle/8.8.2/scripts/init.sh b/dozzle/8.8.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/dozzle/8.8.2/scripts/init.sh +++ b/dozzle/8.8.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/dozzle/8.8.2/scripts/upgrade.sh b/dozzle/8.8.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/dozzle/8.8.2/scripts/upgrade.sh +++ b/dozzle/8.8.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/dpanel-lite/1.2.6/docker-compose.yml b/dpanel-lite/1.2.6/docker-compose.yml index d7bacf7ad..faa00d67f 100644 --- a/dpanel-lite/1.2.6/docker-compose.yml +++ b/dpanel-lite/1.2.6/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8080 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${DPANEL_ROOT_PATH}/data:/dpanel diff --git a/dpanel-lite/1.2.6/scripts/init.sh b/dpanel-lite/1.2.6/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/dpanel-lite/1.2.6/scripts/init.sh +++ b/dpanel-lite/1.2.6/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/dpanel-lite/1.2.6/scripts/upgrade.sh b/dpanel-lite/1.2.6/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/dpanel-lite/1.2.6/scripts/upgrade.sh +++ b/dpanel-lite/1.2.6/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/dpanel/1.2.6/docker-compose.yml b/dpanel/1.2.6/docker-compose.yml index 7cc17d1a3..5fd21acf3 100644 --- a/dpanel/1.2.6/docker-compose.yml +++ b/dpanel/1.2.6/docker-compose.yml @@ -16,7 +16,7 @@ services: - ${PANEL_APP_PORT_HTTP}:80 - ${PANEL_APP_PORT_HTTPS}:443 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${DPANEL_ROOT_PATH}/data:/dpanel diff --git a/dpanel/1.2.6/scripts/init.sh b/dpanel/1.2.6/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/dpanel/1.2.6/scripts/init.sh +++ b/dpanel/1.2.6/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/dpanel/1.2.6/scripts/upgrade.sh b/dpanel/1.2.6/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/dpanel/1.2.6/scripts/upgrade.sh +++ b/dpanel/1.2.6/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/dujiaoka/2.0.9/docker-compose.yml b/dujiaoka/2.0.9/docker-compose.yml index 311ff6e07..410ccdfdc 100644 --- a/dujiaoka/2.0.9/docker-compose.yml +++ b/dujiaoka/2.0.9/docker-compose.yml @@ -16,7 +16,7 @@ services: - ${PANEL_APP_PORT_HTTP}:80 - ${PANEL_APP_PORT_API}:9000 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${DUJIAOKA_ROOT_PATH}/app:/app diff --git a/dujiaoka/2.0.9/scripts/init.sh b/dujiaoka/2.0.9/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/dujiaoka/2.0.9/scripts/init.sh +++ b/dujiaoka/2.0.9/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/dujiaoka/2.0.9/scripts/upgrade.sh b/dujiaoka/2.0.9/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/dujiaoka/2.0.9/scripts/upgrade.sh +++ b/dujiaoka/2.0.9/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/elastic-elasticsearch/8.16.1/docker-compose.yml b/elastic-elasticsearch/8.16.1/docker-compose.yml index 90f1ab637..5382c4939 100644 --- a/elastic-elasticsearch/8.16.1/docker-compose.yml +++ b/elastic-elasticsearch/8.16.1/docker-compose.yml @@ -23,7 +23,7 @@ services: - ${PANEL_APP_PORT_HTTPS}:9200 - ${PANEL_APP_PORT_CLUSTER}:9300 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ELASTICSEARCH_ROOT_PATH}/data:/usr/share/elasticsearch/data diff --git a/elastic-elasticsearch/8.16.1/scripts/init.sh b/elastic-elasticsearch/8.16.1/scripts/init.sh index c5dbe2739..33a7b7f49 100644 --- a/elastic-elasticsearch/8.16.1/scripts/init.sh +++ b/elastic-elasticsearch/8.16.1/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env mkdir -p $ELASTICSEARCH_ROOT_PATH mkdir -p "$ELASTICSEARCH_ROOT_PATH/data" diff --git a/elastic-elasticsearch/8.16.1/scripts/upgrade.sh b/elastic-elasticsearch/8.16.1/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/elastic-elasticsearch/8.16.1/scripts/upgrade.sh +++ b/elastic-elasticsearch/8.16.1/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/elastic-kibana/8.16.1/docker-compose.yml b/elastic-kibana/8.16.1/docker-compose.yml index 29f8b7a1c..161e09057 100644 --- a/elastic-kibana/8.16.1/docker-compose.yml +++ b/elastic-kibana/8.16.1/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5601 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${KIBANA_ROOT_PATH}/data:/usr/share/kibana/data diff --git a/elastic-kibana/8.16.1/scripts/init.sh b/elastic-kibana/8.16.1/scripts/init.sh index 98e49fa6f..f68fbe6d5 100644 --- a/elastic-kibana/8.16.1/scripts/init.sh +++ b/elastic-kibana/8.16.1/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env mkdir -p $KIBANA_ROOT_PATH mkdir -p "$KIBANA_ROOT_PATH/data" diff --git a/elastic-kibana/8.16.1/scripts/upgrade.sh b/elastic-kibana/8.16.1/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/elastic-kibana/8.16.1/scripts/upgrade.sh +++ b/elastic-kibana/8.16.1/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/element-web/1.11.86/docker-compose.yml b/element-web/1.11.86/docker-compose.yml index 5a7e24e0f..b6310049a 100644 --- a/element-web/1.11.86/docker-compose.yml +++ b/element-web/1.11.86/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ELEMENT_WEB_ROOT_PATH}/config/config.json:/app/config.json diff --git a/element-web/1.11.86/scripts/init.sh b/element-web/1.11.86/scripts/init.sh index cd438466c..65e20abfc 100644 --- a/element-web/1.11.86/scripts/init.sh +++ b/element-web/1.11.86/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env # setup-2 copy config file mkdir -p "$ELEMENT_WEB_ROOT_PATH" diff --git a/element-web/1.11.86/scripts/upgrade.sh b/element-web/1.11.86/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/element-web/1.11.86/scripts/upgrade.sh +++ b/element-web/1.11.86/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/emby-amilys/4.8.9.0/scripts/init.sh b/emby-amilys/4.8.9.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/emby-amilys/4.8.9.0/scripts/init.sh +++ b/emby-amilys/4.8.9.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/emby-amilys/4.8.9.0/scripts/upgrade.sh b/emby-amilys/4.8.9.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/emby-amilys/4.8.9.0/scripts/upgrade.sh +++ b/emby-amilys/4.8.9.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/emby-lovechen/4.8.0.21/scripts/init.sh b/emby-lovechen/4.8.0.21/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/emby-lovechen/4.8.0.21/scripts/init.sh +++ b/emby-lovechen/4.8.0.21/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/emby-lovechen/4.8.0.21/scripts/upgrade.sh b/emby-lovechen/4.8.0.21/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/emby-lovechen/4.8.0.21/scripts/upgrade.sh +++ b/emby-lovechen/4.8.0.21/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/emby/4.8.10.0/scripts/init.sh b/emby/4.8.10.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/emby/4.8.10.0/scripts/init.sh +++ b/emby/4.8.10.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/emby/4.8.10.0/scripts/upgrade.sh b/emby/4.8.10.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/emby/4.8.10.0/scripts/upgrade.sh +++ b/emby/4.8.10.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/ghost/5.101.4/docker-compose.yml b/ghost/5.101.4/docker-compose.yml index 0e5451911..74547852f 100644 --- a/ghost/5.101.4/docker-compose.yml +++ b/ghost/5.101.4/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:2368 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${GHOST_ROOT_PATH}/data:/var/lib/ghost/content diff --git a/ghost/5.101.4/scripts/init.sh b/ghost/5.101.4/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/ghost/5.101.4/scripts/init.sh +++ b/ghost/5.101.4/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/ghost/5.101.4/scripts/upgrade.sh b/ghost/5.101.4/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/ghost/5.101.4/scripts/upgrade.sh +++ b/ghost/5.101.4/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/gitea-runner/0.2.11/docker-compose.yml b/gitea-runner/0.2.11/docker-compose.yml index d12055105..dcd12c17f 100644 --- a/gitea-runner/0.2.11/docker-compose.yml +++ b/gitea-runner/0.2.11/docker-compose.yml @@ -13,7 +13,7 @@ services: - 1panel-network privileged: true env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${GITEA_RUNNER_ROOT_PATH}/data:/data diff --git a/gitea/1.22.4/docker-compose.yml b/gitea/1.22.4/docker-compose.yml index 33ba8c8fe..81d46f036 100644 --- a/gitea/1.22.4/docker-compose.yml +++ b/gitea/1.22.4/docker-compose.yml @@ -15,7 +15,7 @@ services: - ${PANEL_APP_PORT_HTTP}:3000 - ${PANEL_APP_PORT_SSH}:22 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - /etc/1panel/envs/gitea/gitea.env - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: diff --git a/gitea/1.22.4/scripts/init.sh b/gitea/1.22.4/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/gitea/1.22.4/scripts/init.sh +++ b/gitea/1.22.4/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/gitea/1.22.4/scripts/upgrade.sh b/gitea/1.22.4/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/gitea/1.22.4/scripts/upgrade.sh +++ b/gitea/1.22.4/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/halo/2.20.10/scripts/init.sh b/halo/2.20.10/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/halo/2.20.10/scripts/init.sh +++ b/halo/2.20.10/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/halo/2.20.10/scripts/upgrade.sh b/halo/2.20.10/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/halo/2.20.10/scripts/upgrade.sh +++ b/halo/2.20.10/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/iframely/2.4.3/docker-compose.yml b/iframely/2.4.3/docker-compose.yml index 0a17e8913..520e6c521 100644 --- a/iframely/2.4.3/docker-compose.yml +++ b/iframely/2.4.3/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8061 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ./config/config.local.js:/iframely/config.local.js diff --git a/iframely/2.4.3/scripts/init.sh b/iframely/2.4.3/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/iframely/2.4.3/scripts/init.sh +++ b/iframely/2.4.3/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/iframely/2.4.3/scripts/upgrade.sh b/iframely/2.4.3/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/iframely/2.4.3/scripts/upgrade.sh +++ b/iframely/2.4.3/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/immich-machine-learning/1.121.0/docker-compose.yml b/immich-machine-learning/1.121.0/docker-compose.yml index 8ca588f45..69a8f942f 100644 --- a/immich-machine-learning/1.121.0/docker-compose.yml +++ b/immich-machine-learning/1.121.0/docker-compose.yml @@ -25,7 +25,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3003 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${IMMICH_ROOT_PATH}/data/cache:/cache diff --git a/immich-machine-learning/1.121.0/scripts/init.sh b/immich-machine-learning/1.121.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/immich-machine-learning/1.121.0/scripts/init.sh +++ b/immich-machine-learning/1.121.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/immich-machine-learning/1.121.0/scripts/upgrade.sh b/immich-machine-learning/1.121.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/immich-machine-learning/1.121.0/scripts/upgrade.sh +++ b/immich-machine-learning/1.121.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/immich-server/1.121.0/docker-compose.yml b/immich-server/1.121.0/docker-compose.yml index 3401114a5..0df36f0eb 100644 --- a/immich-server/1.121.0/docker-compose.yml +++ b/immich-server/1.121.0/docker-compose.yml @@ -25,7 +25,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:2283 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${IMMICH_ROOT_PATH}/data/library:/usr/src/app/upload diff --git a/immich-server/1.121.0/scripts/init.sh b/immich-server/1.121.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/immich-server/1.121.0/scripts/init.sh +++ b/immich-server/1.121.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/immich-server/1.121.0/scripts/upgrade.sh b/immich-server/1.121.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/immich-server/1.121.0/scripts/upgrade.sh +++ b/immich-server/1.121.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/immich/1.121.0/docker-compose.yml b/immich/1.121.0/docker-compose.yml index a5f0f1a22..f6b81f43f 100644 --- a/immich/1.121.0/docker-compose.yml +++ b/immich/1.121.0/docker-compose.yml @@ -66,7 +66,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:2283 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${IMMICH_ROOT_PATH}/data/library:/usr/src/app/upload @@ -86,7 +86,7 @@ services: ports: - ${PANEL_APP_PORT_MACHINE_LEARNING}:3003 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${IMMICH_ROOT_PATH}/data/cache:/cache diff --git a/immich/1.121.0/scripts/init.sh b/immich/1.121.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/immich/1.121.0/scripts/init.sh +++ b/immich/1.121.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/immich/1.121.0/scripts/upgrade.sh b/immich/1.121.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/immich/1.121.0/scripts/upgrade.sh +++ b/immich/1.121.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/iycms/3.3.44/docker-compose.yml b/iycms/3.3.44/docker-compose.yml index 6e11a743a..007b04d12 100644 --- a/iycms/3.3.44/docker-compose.yml +++ b/iycms/3.3.44/docker-compose.yml @@ -15,7 +15,7 @@ services: - ${PANEL_APP_PORT_HTTP}:80 - ${PANEL_APP_PORT_ADMIN}:21007 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${IYCMS_ROOT_PATH}/iycms:/app/iycms diff --git a/iycms/3.3.44/scripts/init.sh b/iycms/3.3.44/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/iycms/3.3.44/scripts/init.sh +++ b/iycms/3.3.44/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/iycms/3.3.44/scripts/upgrade.sh b/iycms/3.3.44/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/iycms/3.3.44/scripts/upgrade.sh +++ b/iycms/3.3.44/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/jellyseerr/2.1.0/docker-compose.yml b/jellyseerr/2.1.0/docker-compose.yml index b83a8a996..17eb649f0 100644 --- a/jellyseerr/2.1.0/docker-compose.yml +++ b/jellyseerr/2.1.0/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5055 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${JELLYSEERR_ROOT_PATH}/config:/app/config diff --git a/jellyseerr/2.1.0/scripts/init.sh b/jellyseerr/2.1.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/jellyseerr/2.1.0/scripts/init.sh +++ b/jellyseerr/2.1.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/jellyseerr/2.1.0/scripts/upgrade.sh b/jellyseerr/2.1.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/jellyseerr/2.1.0/scripts/upgrade.sh +++ b/jellyseerr/2.1.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/jproxy/3.4.4/docker-compose.yml b/jproxy/3.4.4/docker-compose.yml index ba2132000..0e57d2e61 100644 --- a/jproxy/3.4.4/docker-compose.yml +++ b/jproxy/3.4.4/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8117 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${JPROXY_ROOT_PATH}/data:/app/database diff --git a/jproxy/3.4.4/scripts/init.sh b/jproxy/3.4.4/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/jproxy/3.4.4/scripts/init.sh +++ b/jproxy/3.4.4/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/jproxy/3.4.4/scripts/upgrade.sh b/jproxy/3.4.4/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/jproxy/3.4.4/scripts/upgrade.sh +++ b/jproxy/3.4.4/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/kimai/2.23.0/docker-compose.yml b/kimai/2.23.0/docker-compose.yml index 0a46b5aac..5d7846b7a 100644 --- a/kimai/2.23.0/docker-compose.yml +++ b/kimai/2.23.0/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8001 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${KIMAI2_ROOT_PATH}/data:/opt/kimai/var/data diff --git a/kimai/2.23.0/scripts/init.sh b/kimai/2.23.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/kimai/2.23.0/scripts/init.sh +++ b/kimai/2.23.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/kimai/2.23.0/scripts/upgrade.sh b/kimai/2.23.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/kimai/2.23.0/scripts/upgrade.sh +++ b/kimai/2.23.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/limesurvey/6.6.5/docker-compose.yml b/limesurvey/6.6.5/docker-compose.yml index 0eb02680f..6bdeae63f 100644 --- a/limesurvey/6.6.5/docker-compose.yml +++ b/limesurvey/6.6.5/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8080 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${LIMESURVEY_ROOT_PATH}/surveys:/var/www/html/upload/surveys diff --git a/limesurvey/6.6.5/scripts/init.sh b/limesurvey/6.6.5/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/limesurvey/6.6.5/scripts/init.sh +++ b/limesurvey/6.6.5/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/limesurvey/6.6.5/scripts/upgrade.sh b/limesurvey/6.6.5/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/limesurvey/6.6.5/scripts/upgrade.sh +++ b/limesurvey/6.6.5/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/linkding/1.36.0/docker-compose.yml b/linkding/1.36.0/docker-compose.yml index 368e86b01..3dba9799d 100644 --- a/linkding/1.36.0/docker-compose.yml +++ b/linkding/1.36.0/docker-compose.yml @@ -19,7 +19,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:9090 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${LINKDING_ROOT_PATH}/data:/etc/linkding/data diff --git a/linkding/1.36.0/scripts/init.sh b/linkding/1.36.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/linkding/1.36.0/scripts/init.sh +++ b/linkding/1.36.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/linkding/1.36.0/scripts/upgrade.sh b/linkding/1.36.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/linkding/1.36.0/scripts/upgrade.sh +++ b/linkding/1.36.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/maccms10/24.11.19/docker-compose.yml b/maccms10/24.11.19/docker-compose.yml index cddca7952..d44f4c207 100644 --- a/maccms10/24.11.19/docker-compose.yml +++ b/maccms10/24.11.19/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MACCMS10_ROOT_PATH}/iycms:/app/iycms diff --git a/maccms10/24.11.19/scripts/init.sh b/maccms10/24.11.19/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/maccms10/24.11.19/scripts/init.sh +++ b/maccms10/24.11.19/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/maccms10/24.11.19/scripts/upgrade.sh b/maccms10/24.11.19/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/maccms10/24.11.19/scripts/upgrade.sh +++ b/maccms10/24.11.19/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/macos/1.16/docker-compose.yml b/macos/1.16/docker-compose.yml index c42bb681f..5a81d6bd1 100644 --- a/macos/1.16/docker-compose.yml +++ b/macos/1.16/docker-compose.yml @@ -29,7 +29,7 @@ services: # - /dev/nvidia-uvm-tools:/dev/nvidia-uvm-tools # - /dev/video11:/dev/video11 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MACOS_STORAGE_ROOT_PATH}/storage:/storage diff --git a/macos/1.16/scripts/init.sh b/macos/1.16/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/macos/1.16/scripts/init.sh +++ b/macos/1.16/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/macos/1.16/scripts/upgrade.sh b/macos/1.16/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/macos/1.16/scripts/upgrade.sh +++ b/macos/1.16/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/mailserver/14.0.0/docker-compose.yml b/mailserver/14.0.0/docker-compose.yml index d183ba062..c98125530 100644 --- a/mailserver/14.0.0/docker-compose.yml +++ b/mailserver/14.0.0/docker-compose.yml @@ -28,7 +28,7 @@ services: - ${PANEL_APP_PORT_POPS}:995 - ${PANEL_APP_PORT_MANAGESIEVE}:4190 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - /etc/1panel/envs/mailserver/mailserver.env - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: diff --git a/mailserver/14.0.0/scripts/init.sh b/mailserver/14.0.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/mailserver/14.0.0/scripts/init.sh +++ b/mailserver/14.0.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/mailserver/14.0.0/scripts/upgrade.sh b/mailserver/14.0.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/mailserver/14.0.0/scripts/upgrade.sh +++ b/mailserver/14.0.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/mariadb/11.6.2/docker-compose.yml b/mariadb/11.6.2/docker-compose.yml index c98cbb944..6efcc9f8d 100644 --- a/mariadb/11.6.2/docker-compose.yml +++ b/mariadb/11.6.2/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3306 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MARIADB_ROOT_PATH}/data:/var/lib/mysql diff --git a/mariadb/11.6.2/scripts/init.sh b/mariadb/11.6.2/scripts/init.sh index fb017c6cd..4d148914f 100644 --- a/mariadb/11.6.2/scripts/init.sh +++ b/mariadb/11.6.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env mkdir -p "$MARIADB_ROOT_PATH" mkdir -p "$MARIADB_ROOT_PATH/config" diff --git a/mariadb/11.6.2/scripts/upgrade.sh b/mariadb/11.6.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/mariadb/11.6.2/scripts/upgrade.sh +++ b/mariadb/11.6.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/maxkb/1.7.2/docker-compose.yml b/maxkb/1.7.2/docker-compose.yml index 49962edd2..d59086e5f 100644 --- a/maxkb/1.7.2/docker-compose.yml +++ b/maxkb/1.7.2/docker-compose.yml @@ -13,7 +13,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8080 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MAXKB_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/maxkb/1.7.2/scripts/init.sh b/maxkb/1.7.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/maxkb/1.7.2/scripts/init.sh +++ b/maxkb/1.7.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/maxkb/1.7.2/scripts/upgrade.sh b/maxkb/1.7.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/maxkb/1.7.2/scripts/upgrade.sh +++ b/maxkb/1.7.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/mcy-shop/5.0.17/docker-compose.yml b/mcy-shop/5.0.17/docker-compose.yml index f129d7e56..102d471ad 100644 --- a/mcy-shop/5.0.17/docker-compose.yml +++ b/mcy-shop/5.0.17/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MCY_SHOP_ROOT_PATH}/data:/var/www/html diff --git a/mcy-shop/5.0.17/scripts/init.sh b/mcy-shop/5.0.17/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/mcy-shop/5.0.17/scripts/init.sh +++ b/mcy-shop/5.0.17/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/mcy-shop/5.0.17/scripts/upgrade.sh b/mcy-shop/5.0.17/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/mcy-shop/5.0.17/scripts/upgrade.sh +++ b/mcy-shop/5.0.17/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/mediacms/4.1.0/docker-compose.yml b/mediacms/4.1.0/docker-compose.yml index cff4154f5..3c689fad6 100644 --- a/mediacms/4.1.0/docker-compose.yml +++ b/mediacms/4.1.0/docker-compose.yml @@ -7,7 +7,7 @@ services: image: qyg2297248353/mediacms:v4.1.0 container_name: migrations-${CONTAINER_NAME} env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MEDIACMS_ROOT_PATH}/media_files/hls:/home/mediacms.io/mediacms/media_files/hls @@ -37,7 +37,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MEDIACMS_ROOT_PATH}/media_files/hls:/home/mediacms.io/mediacms/media_files/hls diff --git a/mediacms/4.1.0/scripts/init.sh b/mediacms/4.1.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/mediacms/4.1.0/scripts/init.sh +++ b/mediacms/4.1.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/mediacms/4.1.0/scripts/upgrade.sh b/mediacms/4.1.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/mediacms/4.1.0/scripts/upgrade.sh +++ b/mediacms/4.1.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/minio/2024-11-07/docker-compose.yml b/minio/2024-11-07/docker-compose.yml index 5859c9bb0..a0ff7df1e 100644 --- a/minio/2024-11-07/docker-compose.yml +++ b/minio/2024-11-07/docker-compose.yml @@ -16,7 +16,7 @@ services: - ${PANEL_APP_PORT_API}:${MINIO_API_PORT} command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${MINIO_API_PORT} --json env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} extra_hosts: - ${MINIO_SERVER_HOST:-localhost}:127.0.0.1 diff --git a/minio/2024-11-07/scripts/init.sh b/minio/2024-11-07/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/minio/2024-11-07/scripts/init.sh +++ b/minio/2024-11-07/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/minio/2024-11-07/scripts/upgrade.sh b/minio/2024-11-07/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/minio/2024-11-07/scripts/upgrade.sh +++ b/minio/2024-11-07/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/movie-pilot/1.9.17/docker-compose.yml b/movie-pilot/1.9.17/docker-compose.yml index be5b28d4b..3a66684b9 100644 --- a/movie-pilot/1.9.17/docker-compose.yml +++ b/movie-pilot/1.9.17/docker-compose.yml @@ -15,7 +15,7 @@ services: - ${PANEL_APP_PORT_HTTP}:3000 - ${PANEL_APP_PORT_API}:3001 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - /etc/1panel/envs/movie-pilot/movie-pilot.env - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: diff --git a/movie-pilot/1.9.17/scripts/init.sh b/movie-pilot/1.9.17/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/movie-pilot/1.9.17/scripts/init.sh +++ b/movie-pilot/1.9.17/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/movie-pilot/1.9.17/scripts/upgrade.sh b/movie-pilot/1.9.17/scripts/upgrade.sh index 2df25115d..4219e7b6c 100644 --- a/movie-pilot/1.9.17/scripts/upgrade.sh +++ b/movie-pilot/1.9.17/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." else diff --git a/movie-pilot/2.1.0/docker-compose.yml b/movie-pilot/2.1.0/docker-compose.yml index 707c1c026..d391cd004 100644 --- a/movie-pilot/2.1.0/docker-compose.yml +++ b/movie-pilot/2.1.0/docker-compose.yml @@ -15,7 +15,7 @@ services: - ${PANEL_APP_PORT_HTTP}:3000 - ${PANEL_APP_PORT_API}:3001 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - /etc/1panel/envs/movie-pilot/movie-pilot2.env - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: diff --git a/movie-pilot/2.1.0/scripts/init.sh b/movie-pilot/2.1.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/movie-pilot/2.1.0/scripts/init.sh +++ b/movie-pilot/2.1.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/movie-pilot/2.1.0/scripts/upgrade.sh b/movie-pilot/2.1.0/scripts/upgrade.sh index 2df25115d..4219e7b6c 100644 --- a/movie-pilot/2.1.0/scripts/upgrade.sh +++ b/movie-pilot/2.1.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." else diff --git a/mysql/5.7.44/docker-compose.yml b/mysql/5.7.44/docker-compose.yml index 6c767540b..7385b216d 100644 --- a/mysql/5.7.44/docker-compose.yml +++ b/mysql/5.7.44/docker-compose.yml @@ -15,7 +15,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3306 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MYSQL_ROOT_PATH}/data/:/var/lib/mysql diff --git a/mysql/5.7.44/scripts/init.sh b/mysql/5.7.44/scripts/init.sh index 5a20b970f..1cdd90c20 100644 --- a/mysql/5.7.44/scripts/init.sh +++ b/mysql/5.7.44/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env mkdir -p "$MYSQL_ROOT_PATH" mkdir -p "$MYSQL_ROOT_PATH/config" diff --git a/mysql/5.7.44/scripts/upgrade.sh b/mysql/5.7.44/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/mysql/5.7.44/scripts/upgrade.sh +++ b/mysql/5.7.44/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/mysql/8.4.3/docker-compose.yml b/mysql/8.4.3/docker-compose.yml index b991b12a4..af56485d2 100644 --- a/mysql/8.4.3/docker-compose.yml +++ b/mysql/8.4.3/docker-compose.yml @@ -15,7 +15,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3306 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MYSQL_ROOT_PATH}/data:/var/lib/mysql diff --git a/mysql/8.4.3/scripts/init.sh b/mysql/8.4.3/scripts/init.sh index 5a20b970f..1cdd90c20 100644 --- a/mysql/8.4.3/scripts/init.sh +++ b/mysql/8.4.3/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env mkdir -p "$MYSQL_ROOT_PATH" mkdir -p "$MYSQL_ROOT_PATH/config" diff --git a/mysql/8.4.3/scripts/upgrade.sh b/mysql/8.4.3/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/mysql/8.4.3/scripts/upgrade.sh +++ b/mysql/8.4.3/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/nacos/2.4.3/docker-compose.yml b/nacos/2.4.3/docker-compose.yml index 262bf684a..f574f5873 100644 --- a/nacos/2.4.3/docker-compose.yml +++ b/nacos/2.4.3/docker-compose.yml @@ -15,7 +15,7 @@ services: - ${PANEL_APP_PORT_GRPC_CLIENT}:9848 - ${PANEL_APP_PORT_GRPC_SERVER}:9849 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${NACOS_ROOT_PATH}/logs:/home/nacos/logs diff --git a/nacos/2.4.3/scripts/init.sh b/nacos/2.4.3/scripts/init.sh index e13cf8c72..19193ac7b 100644 --- a/nacos/2.4.3/scripts/init.sh +++ b/nacos/2.4.3/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env if command -v mysql &> /dev/null; then if [[ -f ./init/mysql-schema.sql ]]; then diff --git a/nacos/2.4.3/scripts/upgrade.sh b/nacos/2.4.3/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/nacos/2.4.3/scripts/upgrade.sh +++ b/nacos/2.4.3/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/nexusphp/1.8.16/docker-compose.yml b/nexusphp/1.8.16/docker-compose.yml index 4648964b3..0a6fe9a58 100644 --- a/nexusphp/1.8.16/docker-compose.yml +++ b/nexusphp/1.8.16/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${NEXUSPHP_ROOT_PATH}/config/.env.example:/var/www/html/.env.example diff --git a/nexusphp/1.8.16/scripts/init.sh b/nexusphp/1.8.16/scripts/init.sh index fc799a880..1cea64e0c 100644 --- a/nexusphp/1.8.16/scripts/init.sh +++ b/nexusphp/1.8.16/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env # setup-2 download geoip2 GEOIP_DIR="$NEXUSPHP_ROOT_PATH/geoip2" diff --git a/nexusphp/1.8.16/scripts/upgrade.sh b/nexusphp/1.8.16/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/nexusphp/1.8.16/scripts/upgrade.sh +++ b/nexusphp/1.8.16/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/nezha-dash/1.5.2/docker-compose.yml b/nezha-dash/1.5.2/docker-compose.yml index a4f92dd70..0a3bb3f00 100644 --- a/nezha-dash/1.5.2/docker-compose.yml +++ b/nezha-dash/1.5.2/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3000 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - DefaultLocale=zh diff --git a/nezha-dash/1.5.2/scripts/init.sh b/nezha-dash/1.5.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/nezha-dash/1.5.2/scripts/init.sh +++ b/nezha-dash/1.5.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/nezha-dash/1.5.2/scripts/upgrade.sh b/nezha-dash/1.5.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/nezha-dash/1.5.2/scripts/upgrade.sh +++ b/nezha-dash/1.5.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/nginx-ui/2.0.0/docker-compose.yml b/nginx-ui/2.0.0/docker-compose.yml index a2966e1fd..3033ba22d 100644 --- a/nginx-ui/2.0.0/docker-compose.yml +++ b/nginx-ui/2.0.0/docker-compose.yml @@ -16,7 +16,7 @@ services: - ${PANEL_APP_PORT_HTTP}:80 - ${PANEL_APP_PORT_HTTPS}:443 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${NGINX_UI_ROOT_PATH}/nginx:/etc/nginx diff --git a/nginx-ui/2.0.0/scripts/init.sh b/nginx-ui/2.0.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/nginx-ui/2.0.0/scripts/init.sh +++ b/nginx-ui/2.0.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/nginx-ui/2.0.0/scripts/upgrade.sh b/nginx-ui/2.0.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/nginx-ui/2.0.0/scripts/upgrade.sh +++ b/nginx-ui/2.0.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/nocodb/0.258.2/docker-compose.yml b/nocodb/0.258.2/docker-compose.yml index dd6f0db7a..38a4491e8 100644 --- a/nocodb/0.258.2/docker-compose.yml +++ b/nocodb/0.258.2/docker-compose.yml @@ -13,7 +13,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8080 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${NOCODB_ROOT_PATH}/data:/usr/app/data diff --git a/nocodb/0.258.2/scripts/init.sh b/nocodb/0.258.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/nocodb/0.258.2/scripts/init.sh +++ b/nocodb/0.258.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/nocodb/0.258.2/scripts/upgrade.sh b/nocodb/0.258.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/nocodb/0.258.2/scripts/upgrade.sh +++ b/nocodb/0.258.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/onedev/11.5.3/docker-compose.yml b/onedev/11.5.3/docker-compose.yml index 4e496d6fd..e234496e9 100644 --- a/onedev/11.5.3/docker-compose.yml +++ b/onedev/11.5.3/docker-compose.yml @@ -18,7 +18,7 @@ services: - ${ONEDEV_ROOT_PATH}/data:/opt/onedev - /var/run/docker.sock:/var/run/docker.sock env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - /etc/1panel/envs/onedev/onedev.env - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: diff --git a/onedev/11.5.3/scripts/init.sh b/onedev/11.5.3/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/onedev/11.5.3/scripts/init.sh +++ b/onedev/11.5.3/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/onedev/11.5.3/scripts/upgrade.sh b/onedev/11.5.3/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/onedev/11.5.3/scripts/upgrade.sh +++ b/onedev/11.5.3/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/openfire/4.9.0/docker-compose.yml b/openfire/4.9.0/docker-compose.yml index 243e458b8..8a152afbd 100644 --- a/openfire/4.9.0/docker-compose.yml +++ b/openfire/4.9.0/docker-compose.yml @@ -17,7 +17,7 @@ services: - ${PANEL_APP_PORT_SERVER}:5222 - ${PANEL_APP_PORT_MESSAGE}:7777 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${OPENFIRE_ROOT_PATH}/data:/var/lib/openfire diff --git a/openfire/4.9.0/scripts/init.sh b/openfire/4.9.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/openfire/4.9.0/scripts/init.sh +++ b/openfire/4.9.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/openfire/4.9.0/scripts/upgrade.sh b/openfire/4.9.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/openfire/4.9.0/scripts/upgrade.sh +++ b/openfire/4.9.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/outline/0.81.1/docker-compose.yml b/outline/0.81.1/docker-compose.yml index 503ffda82..64997429a 100644 --- a/outline/0.81.1/docker-compose.yml +++ b/outline/0.81.1/docker-compose.yml @@ -16,7 +16,7 @@ services: volumes: - ${OUTLINE_ROOT_PATH}/data:/var/lib/outline/data env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - /etc/1panel/envs/outline/outline.env - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: diff --git a/outline/0.81.1/scripts/init.sh b/outline/0.81.1/scripts/init.sh index b71a9adc0..98e6d8cfd 100644 --- a/outline/0.81.1/scripts/init.sh +++ b/outline/0.81.1/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env # setup-2 remove empty values sed -i '/^.*=""/d' .env diff --git a/outline/0.81.1/scripts/upgrade.sh b/outline/0.81.1/scripts/upgrade.sh index 70ba8d3da..bbf166312 100644 --- a/outline/0.81.1/scripts/upgrade.sh +++ b/outline/0.81.1/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env chmod 777 -R "$OUTLINE_ROOT_PATH" diff --git a/page-spy-web/1.9.6/docker-compose.yml b/page-spy-web/1.9.6/docker-compose.yml index b7e11c35b..d098eeff4 100644 --- a/page-spy-web/1.9.6/docker-compose.yml +++ b/page-spy-web/1.9.6/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:6752 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${PAGE_SPY_WEB_ROOT_PATH}/log:/app/log diff --git a/page-spy-web/1.9.6/scripts/init.sh b/page-spy-web/1.9.6/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/page-spy-web/1.9.6/scripts/init.sh +++ b/page-spy-web/1.9.6/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/page-spy-web/1.9.6/scripts/upgrade.sh b/page-spy-web/1.9.6/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/page-spy-web/1.9.6/scripts/upgrade.sh +++ b/page-spy-web/1.9.6/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/percona/8.0/docker-compose.yml b/percona/8.0/docker-compose.yml index 83a31a261..91d9b6eed 100644 --- a/percona/8.0/docker-compose.yml +++ b/percona/8.0/docker-compose.yml @@ -15,7 +15,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3306 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${PERCONA_ROOT_PATH}/data:/var/lib/mysql diff --git a/percona/8.0/scripts/init.sh b/percona/8.0/scripts/init.sh index 5179ad729..ae47f700c 100644 --- a/percona/8.0/scripts/init.sh +++ b/percona/8.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env mkdir -p "$PERCONA_ROOT_PATH" mkdir -p "$PERCONA_ROOT_PATH/config" diff --git a/percona/8.0/scripts/upgrade.sh b/percona/8.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/percona/8.0/scripts/upgrade.sh +++ b/percona/8.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/photoprism/240915/docker-compose.yml b/photoprism/240915/docker-compose.yml index 873fc9d51..89080c209 100644 --- a/photoprism/240915/docker-compose.yml +++ b/photoprism/240915/docker-compose.yml @@ -29,7 +29,7 @@ services: # - /dev/nvidia-uvm-tools:/dev/nvidia-uvm-tools # - /dev/video11:/dev/video11 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - /etc/1panel/envs/photoprism/photoprism.env - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: diff --git a/photoprism/240915/scripts/init.sh b/photoprism/240915/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/photoprism/240915/scripts/init.sh +++ b/photoprism/240915/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/photoprism/240915/scripts/upgrade.sh b/photoprism/240915/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/photoprism/240915/scripts/upgrade.sh +++ b/photoprism/240915/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/pingvin-share/1.6.1/docker-compose.yml b/pingvin-share/1.6.1/docker-compose.yml index 23c78f313..4eaec5ba5 100644 --- a/pingvin-share/1.6.1/docker-compose.yml +++ b/pingvin-share/1.6.1/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3333 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${PINGVIN_SHARE_ROOT_PATH}/data:/opt/app/backend/data diff --git a/pingvin-share/1.6.1/scripts/init.sh b/pingvin-share/1.6.1/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/pingvin-share/1.6.1/scripts/init.sh +++ b/pingvin-share/1.6.1/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/pingvin-share/1.6.1/scripts/upgrade.sh b/pingvin-share/1.6.1/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/pingvin-share/1.6.1/scripts/upgrade.sh +++ b/pingvin-share/1.6.1/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/pixman/1.8.2/docker-compose.yml b/pixman/1.8.2/docker-compose.yml index 2e135c25b..2a280d4ba 100644 --- a/pixman/1.8.2/docker-compose.yml +++ b/pixman/1.8.2/docker-compose.yml @@ -13,7 +13,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5000 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${PIXMAN_ROOT_PATH}/m3u:/app/app/data/m3u diff --git a/pixman/1.8.2/scripts/init.sh b/pixman/1.8.2/scripts/init.sh index f3ec51b1d..a33a4a556 100644 --- a/pixman/1.8.2/scripts/init.sh +++ b/pixman/1.8.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env if [ ! -d $PIXMAN_ROOT_PATH/m3u ]; then mkdir -p $PIXMAN_ROOT_PATH/m3u diff --git a/pixman/1.8.2/scripts/upgrade.sh b/pixman/1.8.2/scripts/upgrade.sh index f3ec51b1d..a33a4a556 100644 --- a/pixman/1.8.2/scripts/upgrade.sh +++ b/pixman/1.8.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env if [ ! -d $PIXMAN_ROOT_PATH/m3u ]; then mkdir -p $PIXMAN_ROOT_PATH/m3u diff --git a/postgresql/16.6-alpine/docker-compose.yml b/postgresql/16.6-alpine/docker-compose.yml index 1cf2dd584..f1c8fadea 100644 --- a/postgresql/16.6-alpine/docker-compose.yml +++ b/postgresql/16.6-alpine/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/postgresql/16.6-alpine/scripts/init.sh b/postgresql/16.6-alpine/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/16.6-alpine/scripts/init.sh +++ b/postgresql/16.6-alpine/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/16.6-alpine/scripts/upgrade.sh b/postgresql/16.6-alpine/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/16.6-alpine/scripts/upgrade.sh +++ b/postgresql/16.6-alpine/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/16.6/docker-compose.yml b/postgresql/16.6/docker-compose.yml index 5eaa1e4ce..eb4e95f94 100644 --- a/postgresql/16.6/docker-compose.yml +++ b/postgresql/16.6/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/postgresql/16.6/scripts/init.sh b/postgresql/16.6/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/16.6/scripts/init.sh +++ b/postgresql/16.6/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/16.6/scripts/upgrade.sh b/postgresql/16.6/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/16.6/scripts/upgrade.sh +++ b/postgresql/16.6/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/17.2-alpine/docker-compose.yml b/postgresql/17.2-alpine/docker-compose.yml index 5db80e741..479b68e95 100644 --- a/postgresql/17.2-alpine/docker-compose.yml +++ b/postgresql/17.2-alpine/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/postgresql/17.2-alpine/scripts/init.sh b/postgresql/17.2-alpine/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/17.2-alpine/scripts/init.sh +++ b/postgresql/17.2-alpine/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/17.2-alpine/scripts/upgrade.sh b/postgresql/17.2-alpine/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/17.2-alpine/scripts/upgrade.sh +++ b/postgresql/17.2-alpine/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/17.2/docker-compose.yml b/postgresql/17.2/docker-compose.yml index b7d889daa..de00707a9 100644 --- a/postgresql/17.2/docker-compose.yml +++ b/postgresql/17.2/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/postgresql/17.2/scripts/init.sh b/postgresql/17.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/17.2/scripts/init.sh +++ b/postgresql/17.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/17.2/scripts/upgrade.sh b/postgresql/17.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/17.2/scripts/upgrade.sh +++ b/postgresql/17.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/pg14-alpine/docker-compose.yml b/postgresql/pg14-alpine/docker-compose.yml index 038e68b14..416ad6c68 100644 --- a/postgresql/pg14-alpine/docker-compose.yml +++ b/postgresql/pg14-alpine/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/postgresql/pg14-alpine/scripts/init.sh b/postgresql/pg14-alpine/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/pg14-alpine/scripts/init.sh +++ b/postgresql/pg14-alpine/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/pg14-alpine/scripts/upgrade.sh b/postgresql/pg14-alpine/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/pg14-alpine/scripts/upgrade.sh +++ b/postgresql/pg14-alpine/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/pg14-vectors/docker-compose.yml b/postgresql/pg14-vectors/docker-compose.yml index d5a979f94..6925a6975 100644 --- a/postgresql/pg14-vectors/docker-compose.yml +++ b/postgresql/pg14-vectors/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/postgresql/pg14-vectors/scripts/init.sh b/postgresql/pg14-vectors/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/pg14-vectors/scripts/init.sh +++ b/postgresql/pg14-vectors/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/pg14-vectors/scripts/upgrade.sh b/postgresql/pg14-vectors/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/pg14-vectors/scripts/upgrade.sh +++ b/postgresql/pg14-vectors/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/pg14/docker-compose.yml b/postgresql/pg14/docker-compose.yml index 86edcbbe2..5510b8e2e 100644 --- a/postgresql/pg14/docker-compose.yml +++ b/postgresql/pg14/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/postgresql/pg14/scripts/init.sh b/postgresql/pg14/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/pg14/scripts/init.sh +++ b/postgresql/pg14/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/pg14/scripts/upgrade.sh b/postgresql/pg14/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/pg14/scripts/upgrade.sh +++ b/postgresql/pg14/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/pg15-alpine/docker-compose.yml b/postgresql/pg15-alpine/docker-compose.yml index 58128c8b7..cf4f24ca1 100644 --- a/postgresql/pg15-alpine/docker-compose.yml +++ b/postgresql/pg15-alpine/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/postgresql/pg15-alpine/scripts/init.sh b/postgresql/pg15-alpine/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/pg15-alpine/scripts/init.sh +++ b/postgresql/pg15-alpine/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/pg15-alpine/scripts/upgrade.sh b/postgresql/pg15-alpine/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/pg15-alpine/scripts/upgrade.sh +++ b/postgresql/pg15-alpine/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/pg15-vectors/docker-compose.yml b/postgresql/pg15-vectors/docker-compose.yml index 422901f93..5abb791dc 100644 --- a/postgresql/pg15-vectors/docker-compose.yml +++ b/postgresql/pg15-vectors/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/postgresql/pg15-vectors/scripts/init.sh b/postgresql/pg15-vectors/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/pg15-vectors/scripts/init.sh +++ b/postgresql/pg15-vectors/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/pg15-vectors/scripts/upgrade.sh b/postgresql/pg15-vectors/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/pg15-vectors/scripts/upgrade.sh +++ b/postgresql/pg15-vectors/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/pg15/docker-compose.yml b/postgresql/pg15/docker-compose.yml index 7f2b15361..17d11df83 100644 --- a/postgresql/pg15/docker-compose.yml +++ b/postgresql/pg15/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/postgresql/pg15/scripts/init.sh b/postgresql/pg15/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/pg15/scripts/init.sh +++ b/postgresql/pg15/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/pg15/scripts/upgrade.sh b/postgresql/pg15/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/pg15/scripts/upgrade.sh +++ b/postgresql/pg15/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/pg16-alpine/docker-compose.yml b/postgresql/pg16-alpine/docker-compose.yml index 4cd236c76..8ed2c2e67 100644 --- a/postgresql/pg16-alpine/docker-compose.yml +++ b/postgresql/pg16-alpine/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/postgresql/pg16-alpine/scripts/init.sh b/postgresql/pg16-alpine/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/pg16-alpine/scripts/init.sh +++ b/postgresql/pg16-alpine/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/pg16-alpine/scripts/upgrade.sh b/postgresql/pg16-alpine/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/pg16-alpine/scripts/upgrade.sh +++ b/postgresql/pg16-alpine/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/pg16-vectors/docker-compose.yml b/postgresql/pg16-vectors/docker-compose.yml index b1f04ece4..be4d7d9cb 100644 --- a/postgresql/pg16-vectors/docker-compose.yml +++ b/postgresql/pg16-vectors/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/postgresql/pg16-vectors/scripts/init.sh b/postgresql/pg16-vectors/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/pg16-vectors/scripts/init.sh +++ b/postgresql/pg16-vectors/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/pg16-vectors/scripts/upgrade.sh b/postgresql/pg16-vectors/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/pg16-vectors/scripts/upgrade.sh +++ b/postgresql/pg16-vectors/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/pg16/docker-compose.yml b/postgresql/pg16/docker-compose.yml index f2dce1196..f186cdabc 100644 --- a/postgresql/pg16/docker-compose.yml +++ b/postgresql/pg16/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/postgresql/pg16/scripts/init.sh b/postgresql/pg16/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/pg16/scripts/init.sh +++ b/postgresql/pg16/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/postgresql/pg16/scripts/upgrade.sh b/postgresql/pg16/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/postgresql/pg16/scripts/upgrade.sh +++ b/postgresql/pg16/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/prowlarr/1.27.0/docker-compose.yml b/prowlarr/1.27.0/docker-compose.yml index 85e3e58b7..49bb6a058 100644 --- a/prowlarr/1.27.0/docker-compose.yml +++ b/prowlarr/1.27.0/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:9696 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${PROWLARR_ROOT_PATH}/config:/config diff --git a/prowlarr/1.27.0/scripts/init.sh b/prowlarr/1.27.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/prowlarr/1.27.0/scripts/init.sh +++ b/prowlarr/1.27.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/prowlarr/1.27.0/scripts/upgrade.sh b/prowlarr/1.27.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/prowlarr/1.27.0/scripts/upgrade.sh +++ b/prowlarr/1.27.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/puff/0.2.2/docker-compose.yml b/puff/0.2.2/docker-compose.yml index 1d5317c89..cce843dde 100644 --- a/puff/0.2.2/docker-compose.yml +++ b/puff/0.2.2/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8080 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${PUFF_ROOT_PATH}/data:/app/data diff --git a/puff/0.2.2/scripts/init.sh b/puff/0.2.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/puff/0.2.2/scripts/init.sh +++ b/puff/0.2.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/puff/0.2.2/scripts/upgrade.sh b/puff/0.2.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/puff/0.2.2/scripts/upgrade.sh +++ b/puff/0.2.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/qbittorrent/4.6.7/docker-compose.yml b/qbittorrent/4.6.7/docker-compose.yml index c4e5f5f3c..e351cac1b 100644 --- a/qbittorrent/4.6.7/docker-compose.yml +++ b/qbittorrent/4.6.7/docker-compose.yml @@ -15,7 +15,7 @@ services: - ${PANEL_APP_PORT_TORRENTING} - ${PANEL_APP_PORT_TORRENTING}/udp env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} volumes: - ${QBITTORRENT_ROOT_PATH}/config:/config - ${QBITTORRENT_ROOT_PATH}/downloads:/downloads diff --git a/qbittorrent/5.0.2/docker-compose.yml b/qbittorrent/5.0.2/docker-compose.yml index 2f5f65080..1397dba98 100644 --- a/qbittorrent/5.0.2/docker-compose.yml +++ b/qbittorrent/5.0.2/docker-compose.yml @@ -15,7 +15,7 @@ services: - ${PANEL_APP_PORT_TORRENTING} - ${PANEL_APP_PORT_TORRENTING}/udp env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} volumes: - ${QBITTORRENT_ROOT_PATH}/config:/config - ${QBITTORRENT_ROOT_PATH}/downloads:/downloads diff --git a/radarr/5.15.1/docker-compose.yml b/radarr/5.15.1/docker-compose.yml index 4e75ec8c4..069e29eab 100644 --- a/radarr/5.15.1/docker-compose.yml +++ b/radarr/5.15.1/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:7878 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${RADARR_ROOT_PATH}/config:/config diff --git a/radarr/5.15.1/scripts/init.sh b/radarr/5.15.1/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/radarr/5.15.1/scripts/init.sh +++ b/radarr/5.15.1/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/radarr/5.15.1/scripts/upgrade.sh b/radarr/5.15.1/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/radarr/5.15.1/scripts/upgrade.sh +++ b/radarr/5.15.1/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/reader3-webview/3.2.0/docker-compose.yml b/reader3-webview/3.2.0/docker-compose.yml index 708b77176..e1082b550 100644 --- a/reader3-webview/3.2.0/docker-compose.yml +++ b/reader3-webview/3.2.0/docker-compose.yml @@ -14,4 +14,4 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8050 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} diff --git a/reader3/3.2.10/docker-compose.yml b/reader3/3.2.10/docker-compose.yml index c256bc9bb..d6602d9e6 100644 --- a/reader3/3.2.10/docker-compose.yml +++ b/reader3/3.2.10/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8080 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${READER3_ROOT_PATH}/logs:/logs diff --git a/reader3/3.2.10/scripts/init.sh b/reader3/3.2.10/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/reader3/3.2.10/scripts/init.sh +++ b/reader3/3.2.10/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/reader3/3.2.10/scripts/upgrade.sh b/reader3/3.2.10/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/reader3/3.2.10/scripts/upgrade.sh +++ b/reader3/3.2.10/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/rsshub/2024-11-26/docker-compose.yml b/rsshub/2024-11-26/docker-compose.yml index a07f79a24..e29420a99 100644 --- a/rsshub/2024-11-26/docker-compose.yml +++ b/rsshub/2024-11-26/docker-compose.yml @@ -35,7 +35,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:1200 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - NODE_ENV=production diff --git a/rsshub/2024-11-26/scripts/init.sh b/rsshub/2024-11-26/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/rsshub/2024-11-26/scripts/init.sh +++ b/rsshub/2024-11-26/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/rsshub/2024-11-26/scripts/upgrade.sh b/rsshub/2024-11-26/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/rsshub/2024-11-26/scripts/upgrade.sh +++ b/rsshub/2024-11-26/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/sentinel/1.8.8/scripts/init.sh b/sentinel/1.8.8/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/sentinel/1.8.8/scripts/init.sh +++ b/sentinel/1.8.8/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/sentinel/1.8.8/scripts/upgrade.sh b/sentinel/1.8.8/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/sentinel/1.8.8/scripts/upgrade.sh +++ b/sentinel/1.8.8/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/shiori/1.7.1/docker-compose.yml b/shiori/1.7.1/docker-compose.yml index 89b7e7df5..5d0948ec4 100644 --- a/shiori/1.7.1/docker-compose.yml +++ b/shiori/1.7.1/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8080 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${SHIORI_ROOT_PATH}/dev-data:/srv/shiori diff --git a/shiori/1.7.1/scripts/init.sh b/shiori/1.7.1/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/shiori/1.7.1/scripts/init.sh +++ b/shiori/1.7.1/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/shiori/1.7.1/scripts/upgrade.sh b/shiori/1.7.1/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/shiori/1.7.1/scripts/upgrade.sh +++ b/shiori/1.7.1/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/siyuan/3.1.13/docker-compose.yml b/siyuan/3.1.13/docker-compose.yml index 46c6b6c2a..87a89a3ea 100644 --- a/siyuan/3.1.13/docker-compose.yml +++ b/siyuan/3.1.13/docker-compose.yml @@ -16,7 +16,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:6806 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} volumes: - ${SIYUAN_ROOT_PATH}/workspace:/siyuan/workspace environment: diff --git a/slink/1.2.1/docker-compose.yml b/slink/1.2.1/docker-compose.yml index 3f8ba91ad..da748bc94 100644 --- a/slink/1.2.1/docker-compose.yml +++ b/slink/1.2.1/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3000 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${SLINK_ROOT_PATH}/data:/app/var/data diff --git a/slink/1.2.1/scripts/init.sh b/slink/1.2.1/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/slink/1.2.1/scripts/init.sh +++ b/slink/1.2.1/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/slink/1.2.1/scripts/upgrade.sh b/slink/1.2.1/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/slink/1.2.1/scripts/upgrade.sh +++ b/slink/1.2.1/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/sonarr/4.0.11/docker-compose.yml b/sonarr/4.0.11/docker-compose.yml index a0de39c75..da145d2cd 100644 --- a/sonarr/4.0.11/docker-compose.yml +++ b/sonarr/4.0.11/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8989 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${SONARR_ROOT_PATH}/config:/config diff --git a/sonarr/4.0.11/scripts/init.sh b/sonarr/4.0.11/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/sonarr/4.0.11/scripts/init.sh +++ b/sonarr/4.0.11/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/sonarr/4.0.11/scripts/upgrade.sh b/sonarr/4.0.11/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/sonarr/4.0.11/scripts/upgrade.sh +++ b/sonarr/4.0.11/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/speedtest/5.4.1/docker-compose.yml b/speedtest/5.4.1/docker-compose.yml index c562e975d..6dbf5762f 100644 --- a/speedtest/5.4.1/docker-compose.yml +++ b/speedtest/5.4.1/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${SPEED_TEST_ROOT_PATH}/database:/database diff --git a/speedtest/5.4.1/scripts/init.sh b/speedtest/5.4.1/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/speedtest/5.4.1/scripts/init.sh +++ b/speedtest/5.4.1/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/speedtest/5.4.1/scripts/upgrade.sh b/speedtest/5.4.1/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/speedtest/5.4.1/scripts/upgrade.sh +++ b/speedtest/5.4.1/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/stream-rec-backend/0.7.2/docker-compose.yml b/stream-rec-backend/0.7.2/docker-compose.yml index eb39283ce..71e52df91 100644 --- a/stream-rec-backend/0.7.2/docker-compose.yml +++ b/stream-rec-backend/0.7.2/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:12555 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${STREAM_REC_ROOT_PATH}/records:/opt/records diff --git a/stream-rec-backend/0.7.2/scripts/init.sh b/stream-rec-backend/0.7.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/stream-rec-backend/0.7.2/scripts/init.sh +++ b/stream-rec-backend/0.7.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/stream-rec-backend/0.7.2/scripts/upgrade.sh b/stream-rec-backend/0.7.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/stream-rec-backend/0.7.2/scripts/upgrade.sh +++ b/stream-rec-backend/0.7.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/stream-rec-frontend/0.7.2/docker-compose.yml b/stream-rec-frontend/0.7.2/docker-compose.yml index 8641974a6..1d695a01a 100644 --- a/stream-rec-frontend/0.7.2/docker-compose.yml +++ b/stream-rec-frontend/0.7.2/docker-compose.yml @@ -14,5 +14,5 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:15275 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} diff --git a/stream-rec-frontend/0.7.2/scripts/init.sh b/stream-rec-frontend/0.7.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/stream-rec-frontend/0.7.2/scripts/init.sh +++ b/stream-rec-frontend/0.7.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/stream-rec-frontend/0.7.2/scripts/upgrade.sh b/stream-rec-frontend/0.7.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/stream-rec-frontend/0.7.2/scripts/upgrade.sh +++ b/stream-rec-frontend/0.7.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/stream-rec/0.7.2/docker-compose.yml b/stream-rec/0.7.2/docker-compose.yml index 29a492fa7..8648c2a9b 100644 --- a/stream-rec/0.7.2/docker-compose.yml +++ b/stream-rec/0.7.2/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_API}:12555 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${STREAM_REC_ROOT_PATH}/records:/opt/records @@ -37,5 +37,5 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:15275 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} diff --git a/stream-rec/0.7.2/scripts/init.sh b/stream-rec/0.7.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/stream-rec/0.7.2/scripts/init.sh +++ b/stream-rec/0.7.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/stream-rec/0.7.2/scripts/upgrade.sh b/stream-rec/0.7.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/stream-rec/0.7.2/scripts/upgrade.sh +++ b/stream-rec/0.7.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/sun-panel/1.6.0/docker-compose.yml b/sun-panel/1.6.0/docker-compose.yml index ddd37273d..01637ede1 100644 --- a/sun-panel/1.6.0/docker-compose.yml +++ b/sun-panel/1.6.0/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3002 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${SUN_PANEL_ROOT_PATH}/conf:/app/conf diff --git a/sun-panel/1.6.0/scripts/init.sh b/sun-panel/1.6.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/sun-panel/1.6.0/scripts/init.sh +++ b/sun-panel/1.6.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/sun-panel/1.6.0/scripts/upgrade.sh b/sun-panel/1.6.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/sun-panel/1.6.0/scripts/upgrade.sh +++ b/sun-panel/1.6.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/synapse-admin/0.10.3/docker-compose.yml b/synapse-admin/0.10.3/docker-compose.yml index 4b1e8d832..c02c0b35e 100644 --- a/synapse-admin/0.10.3/docker-compose.yml +++ b/synapse-admin/0.10.3/docker-compose.yml @@ -14,5 +14,5 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} diff --git a/synapse-admin/0.10.3/scripts/init.sh b/synapse-admin/0.10.3/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/synapse-admin/0.10.3/scripts/init.sh +++ b/synapse-admin/0.10.3/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/synapse-admin/0.10.3/scripts/upgrade.sh b/synapse-admin/0.10.3/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/synapse-admin/0.10.3/scripts/upgrade.sh +++ b/synapse-admin/0.10.3/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/synapse/1.120.0/docker-compose.yml b/synapse/1.120.0/docker-compose.yml index efc1faa28..8fff5a33d 100644 --- a/synapse/1.120.0/docker-compose.yml +++ b/synapse/1.120.0/docker-compose.yml @@ -10,7 +10,7 @@ services: - /start.py - generate env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${SYNAPSE_ROOT_PATH}/data:/data @@ -32,7 +32,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8008 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${SYNAPSE_ROOT_PATH}/data:/data diff --git a/synapse/1.120.0/scripts/init.sh b/synapse/1.120.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/synapse/1.120.0/scripts/init.sh +++ b/synapse/1.120.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/synapse/1.120.0/scripts/upgrade.sh b/synapse/1.120.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/synapse/1.120.0/scripts/upgrade.sh +++ b/synapse/1.120.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/tangsengdaodao/1.5/docker-compose.yml b/tangsengdaodao/1.5/docker-compose.yml index 0c119c744..011c18019 100644 --- a/tangsengdaodao/1.5/docker-compose.yml +++ b/tangsengdaodao/1.5/docker-compose.yml @@ -16,7 +16,7 @@ services: - ${PANEL_APP_PORT_WK_WS}:5200 - ${PANEL_APP_PORT_WK_WEB_SERVER}:5300 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${TANGSENGDAODAO_ROOT_PATH}/wukongim:/root/wukongim @@ -40,7 +40,7 @@ services: ports: - ${PANEL_APP_PORT_TS_APP_HTTP}:8090 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} command: "api" healthcheck: @@ -72,7 +72,7 @@ services: ports: - ${PANEL_APP_PORT_TS_APP_WEB}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - API_URL=http://${WK_EXTERNAL_IP}:${PANEL_APP_PORT_TS_APP_HTTP}/ @@ -87,7 +87,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - API_URL=http://${WK_EXTERNAL_IP}:${PANEL_APP_PORT_TS_APP_HTTP}/ diff --git a/tangsengdaodao/1.5/scripts/init.sh b/tangsengdaodao/1.5/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/tangsengdaodao/1.5/scripts/init.sh +++ b/tangsengdaodao/1.5/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/tangsengdaodao/1.5/scripts/upgrade.sh b/tangsengdaodao/1.5/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/tangsengdaodao/1.5/scripts/upgrade.sh +++ b/tangsengdaodao/1.5/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/teemii/0.8.2/docker-compose.yml b/teemii/0.8.2/docker-compose.yml index 1cbddee8d..1fe8c51e1 100644 --- a/teemii/0.8.2/docker-compose.yml +++ b/teemii/0.8.2/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - VITE_APP_PORT=80 @@ -27,7 +27,7 @@ services: networks: - 1panel-network env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${TEEMII_ROOT_PATH}/data:/data diff --git a/teemii/0.8.2/scripts/init.sh b/teemii/0.8.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/teemii/0.8.2/scripts/init.sh +++ b/teemii/0.8.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/teemii/0.8.2/scripts/upgrade.sh b/teemii/0.8.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/teemii/0.8.2/scripts/upgrade.sh +++ b/teemii/0.8.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/telegram-bot-api/8.0/docker-compose.yml b/telegram-bot-api/8.0/docker-compose.yml index 9a80ed91b..8499c31f7 100644 --- a/telegram-bot-api/8.0/docker-compose.yml +++ b/telegram-bot-api/8.0/docker-compose.yml @@ -15,7 +15,7 @@ services: - ${PANEL_APP_PORT_HTTPS}:8081 - ${PANEL_APP_PORT_HTTP}:8082 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${TELEGRAM_BOT_API_ROOT_PATH}/data:/var/lib/telegram-bot-api diff --git a/telegram-bot-api/8.0/scripts/init.sh b/telegram-bot-api/8.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/telegram-bot-api/8.0/scripts/init.sh +++ b/telegram-bot-api/8.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/telegram-bot-api/8.0/scripts/upgrade.sh b/telegram-bot-api/8.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/telegram-bot-api/8.0/scripts/upgrade.sh +++ b/telegram-bot-api/8.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/traccar/6.5/docker-compose.yml b/traccar/6.5/docker-compose.yml index 552ee1022..a5ffdd8eb 100644 --- a/traccar/6.5/docker-compose.yml +++ b/traccar/6.5/docker-compose.yml @@ -15,7 +15,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8082 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${TRACCAR_ROOT_PATH}/logs:/opt/traccar/logs:rw diff --git a/traccar/6.5/scripts/init.sh b/traccar/6.5/scripts/init.sh index bbb4e0793..7f45cbee6 100644 --- a/traccar/6.5/scripts/init.sh +++ b/traccar/6.5/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env cp conf/traccar.xml "${TRACCAR_ROOT_PATH}/traccar.xml" diff --git a/traccar/6.5/scripts/upgrade.sh b/traccar/6.5/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/traccar/6.5/scripts/upgrade.sh +++ b/traccar/6.5/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/transmission/4.0.6/docker-compose.yml b/transmission/4.0.6/docker-compose.yml index 7278403ab..dbe20aae5 100644 --- a/transmission/4.0.6/docker-compose.yml +++ b/transmission/4.0.6/docker-compose.yml @@ -15,7 +15,7 @@ services: - ${PANEL_APP_PORT_TORRENTING} - ${PANEL_APP_PORT_TORRENTING}/udp env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${TRANSMISSION_ROOT_PATH}/config:/config diff --git a/transmission/4.0.6/scripts/init.sh b/transmission/4.0.6/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/transmission/4.0.6/scripts/init.sh +++ b/transmission/4.0.6/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/transmission/4.0.6/scripts/upgrade.sh b/transmission/4.0.6/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/transmission/4.0.6/scripts/upgrade.sh +++ b/transmission/4.0.6/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/umami-mysql/2.14.0/docker-compose.yml b/umami-mysql/2.14.0/docker-compose.yml index 79466afec..c6c469c92 100644 --- a/umami-mysql/2.14.0/docker-compose.yml +++ b/umami-mysql/2.14.0/docker-compose.yml @@ -16,7 +16,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3000 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - DISABLE_TELEMETRY = 1 diff --git a/umami-mysql/2.14.0/scripts/init.sh b/umami-mysql/2.14.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/umami-mysql/2.14.0/scripts/init.sh +++ b/umami-mysql/2.14.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/umami-mysql/2.14.0/scripts/upgrade.sh b/umami-mysql/2.14.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/umami-mysql/2.14.0/scripts/upgrade.sh +++ b/umami-mysql/2.14.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/umami/2.14.0/docker-compose.yml b/umami/2.14.0/docker-compose.yml index b38c9d802..bfcc4cb06 100644 --- a/umami/2.14.0/docker-compose.yml +++ b/umami/2.14.0/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3000 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - DISABLE_TELEMETRY = 1 diff --git a/umami/2.14.0/scripts/init.sh b/umami/2.14.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/umami/2.14.0/scripts/init.sh +++ b/umami/2.14.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/umami/2.14.0/scripts/upgrade.sh b/umami/2.14.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/umami/2.14.0/scripts/upgrade.sh +++ b/umami/2.14.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/uptime-kuma/1.23.15/docker-compose.yml b/uptime-kuma/1.23.15/docker-compose.yml index fb9345b3c..bf7f15342 100644 --- a/uptime-kuma/1.23.15/docker-compose.yml +++ b/uptime-kuma/1.23.15/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3001 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${UPTIME_KUMA_ROOT_PATH}/data:/app/data diff --git a/uptime-kuma/1.23.15/scripts/init.sh b/uptime-kuma/1.23.15/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/uptime-kuma/1.23.15/scripts/init.sh +++ b/uptime-kuma/1.23.15/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/uptime-kuma/1.23.15/scripts/upgrade.sh b/uptime-kuma/1.23.15/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/uptime-kuma/1.23.15/scripts/upgrade.sh +++ b/uptime-kuma/1.23.15/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/uptime-kuma/2.0.0/docker-compose.yml b/uptime-kuma/2.0.0/docker-compose.yml index 09a1ef248..79d81536c 100644 --- a/uptime-kuma/2.0.0/docker-compose.yml +++ b/uptime-kuma/2.0.0/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3001 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${UPTIME_KUMA_ROOT_PATH}/data:/app/data diff --git a/uptime-kuma/2.0.0/scripts/init.sh b/uptime-kuma/2.0.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/uptime-kuma/2.0.0/scripts/init.sh +++ b/uptime-kuma/2.0.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/uptime-kuma/2.0.0/scripts/upgrade.sh b/uptime-kuma/2.0.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/uptime-kuma/2.0.0/scripts/upgrade.sh +++ b/uptime-kuma/2.0.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/watchyourlan/2.0.4/docker-compose.yml b/watchyourlan/2.0.4/docker-compose.yml index e477e30a0..aaf0dfe44 100644 --- a/watchyourlan/2.0.4/docker-compose.yml +++ b/watchyourlan/2.0.4/docker-compose.yml @@ -13,7 +13,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8840 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${WATCHYOURLAN_ROOT_PATH}/data:/data/WatchYourLAN diff --git a/watchyourlan/2.0.4/scripts/init.sh b/watchyourlan/2.0.4/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/watchyourlan/2.0.4/scripts/init.sh +++ b/watchyourlan/2.0.4/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/watchyourlan/2.0.4/scripts/upgrade.sh b/watchyourlan/2.0.4/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/watchyourlan/2.0.4/scripts/upgrade.sh +++ b/watchyourlan/2.0.4/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/windows/4.05/docker-compose.yml b/windows/4.05/docker-compose.yml index 2cb693ef8..d253f0cc0 100644 --- a/windows/4.05/docker-compose.yml +++ b/windows/4.05/docker-compose.yml @@ -29,7 +29,7 @@ services: # - /dev/nvidia-uvm-tools:/dev/nvidia-uvm-tools # - /dev/video11:/dev/video11 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${WINDOWS_STORAGE_ROOT_PATH}/storage:/storage diff --git a/windows/4.05/scripts/init.sh b/windows/4.05/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/windows/4.05/scripts/init.sh +++ b/windows/4.05/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/windows/4.05/scripts/upgrade.sh b/windows/4.05/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/windows/4.05/scripts/upgrade.sh +++ b/windows/4.05/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/wiseflow/0.3.0/docker-compose.yml b/wiseflow/0.3.0/docker-compose.yml index 57bb24358..4759d67a9 100644 --- a/wiseflow/0.3.0/docker-compose.yml +++ b/wiseflow/0.3.0/docker-compose.yml @@ -17,7 +17,7 @@ services: - ${PANEL_APP_PORT_HTTP}:8090 - ${PANEL_APP_PORT_BACKEND}:8077 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${WISEFLOW_ROOT_PATH}/pb_data:/app/pb/pb_data diff --git a/wiseflow/0.3.0/scripts/init.sh b/wiseflow/0.3.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/wiseflow/0.3.0/scripts/init.sh +++ b/wiseflow/0.3.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/wiseflow/0.3.0/scripts/upgrade.sh b/wiseflow/0.3.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/wiseflow/0.3.0/scripts/upgrade.sh +++ b/wiseflow/0.3.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/wukongim/1.2.6/docker-compose.yml b/wukongim/1.2.6/docker-compose.yml index f4f111213..5c98da8e0 100644 --- a/wukongim/1.2.6/docker-compose.yml +++ b/wukongim/1.2.6/docker-compose.yml @@ -18,7 +18,7 @@ services: - ${PANEL_APP_PORT_WK_WS}:5200 - ${PANEL_APP_PORT_WK_DEMO_SERVER}:5172 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${WUKONGIM_ROOT_PATH}/wukongim:/root/wukongim diff --git a/wukongim/1.2.6/scripts/init.sh b/wukongim/1.2.6/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/wukongim/1.2.6/scripts/init.sh +++ b/wukongim/1.2.6/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/wukongim/1.2.6/scripts/upgrade.sh b/wukongim/1.2.6/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/wukongim/1.2.6/scripts/upgrade.sh +++ b/wukongim/1.2.6/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/xunlei-cnk3x/3.20.2/docker-compose.yml b/xunlei-cnk3x/3.20.2/docker-compose.yml index 2dc624cc9..b13a2aa41 100644 --- a/xunlei-cnk3x/3.20.2/docker-compose.yml +++ b/xunlei-cnk3x/3.20.2/docker-compose.yml @@ -14,7 +14,7 @@ services: - ${PANEL_APP_PORT_HTTP}:2345 privileged: true env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${XUNLEI_ROOT_PATH}/data:/xunlei/data diff --git a/xunlei-cnk3x/3.20.2/scripts/init.sh b/xunlei-cnk3x/3.20.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/xunlei-cnk3x/3.20.2/scripts/init.sh +++ b/xunlei-cnk3x/3.20.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/xunlei-cnk3x/3.20.2/scripts/upgrade.sh b/xunlei-cnk3x/3.20.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/xunlei-cnk3x/3.20.2/scripts/upgrade.sh +++ b/xunlei-cnk3x/3.20.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/zerotier-planet/1.14.2/docker-compose.yml b/zerotier-planet/1.14.2/docker-compose.yml index 993bc2347..3e851d6cb 100644 --- a/zerotier-planet/1.14.2/docker-compose.yml +++ b/zerotier-planet/1.14.2/docker-compose.yml @@ -16,7 +16,7 @@ services: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - ${PANEL_APP_PORT_FILE}:${PANEL_APP_PORT_FILE} env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ZEROTIER_PLANET_ROOT_PATH}/file:/app/dist diff --git a/zerotier-planet/1.14.2/scripts/init.sh b/zerotier-planet/1.14.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/zerotier-planet/1.14.2/scripts/init.sh +++ b/zerotier-planet/1.14.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/zerotier-planet/1.14.2/scripts/upgrade.sh b/zerotier-planet/1.14.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/zerotier-planet/1.14.2/scripts/upgrade.sh +++ b/zerotier-planet/1.14.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/ztncui/1.2.17/docker-compose.yml b/ztncui/1.2.17/docker-compose.yml index f4e30b051..e0772d4eb 100644 --- a/ztncui/1.2.17/docker-compose.yml +++ b/ztncui/1.2.17/docker-compose.yml @@ -16,7 +16,7 @@ services: - ${PANEL_APP_PORT_API}:${PANEL_APP_PORT_API}/udp - ${PANEL_APP_PORT_FILE}:3180 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ZTNCUI_ROOT_PATH}/ztncui:/opt/key-networks/ztncui/etc diff --git a/ztncui/1.2.17/scripts/init.sh b/ztncui/1.2.17/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/ztncui/1.2.17/scripts/init.sh +++ b/ztncui/1.2.17/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/ztncui/1.2.17/scripts/upgrade.sh b/ztncui/1.2.17/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/ztncui/1.2.17/scripts/upgrade.sh +++ b/ztncui/1.2.17/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish."