diff --git a/apps/acg-faka/1.3.8/docker-compose.yml b/apps/acg-faka/1.3.8/docker-compose.yml index 0906ac01..9c136e5d 100644 --- a/apps/acg-faka/1.3.8/docker-compose.yml +++ b/apps/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/apps/acg-faka/1.3.8/scripts/init.sh b/apps/acg-faka/1.3.8/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/acg-faka/1.3.8/scripts/init.sh +++ b/apps/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/apps/acg-faka/1.3.8/scripts/upgrade.sh b/apps/acg-faka/1.3.8/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/acg-faka/1.3.8/scripts/upgrade.sh +++ b/apps/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/apps/alist-aria2/3.40.0/docker-compose.yml b/apps/alist-aria2/3.40.0/docker-compose.yml index 1e03e01f..c27227fa 100644 --- a/apps/alist-aria2/3.40.0/docker-compose.yml +++ b/apps/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/apps/alist-aria2/3.40.0/scripts/init.sh b/apps/alist-aria2/3.40.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/alist-aria2/3.40.0/scripts/init.sh +++ b/apps/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/apps/alist-aria2/3.40.0/scripts/upgrade.sh b/apps/alist-aria2/3.40.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/alist-aria2/3.40.0/scripts/upgrade.sh +++ b/apps/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/apps/alist-ffmpeg/3.40.0/docker-compose.yml b/apps/alist-ffmpeg/3.40.0/docker-compose.yml index 7c064af6..76fcfb8c 100644 --- a/apps/alist-ffmpeg/3.40.0/docker-compose.yml +++ b/apps/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/apps/alist-ffmpeg/3.40.0/scripts/init.sh b/apps/alist-ffmpeg/3.40.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/alist-ffmpeg/3.40.0/scripts/init.sh +++ b/apps/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/apps/alist-ffmpeg/3.40.0/scripts/upgrade.sh b/apps/alist-ffmpeg/3.40.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/alist-ffmpeg/3.40.0/scripts/upgrade.sh +++ b/apps/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/apps/alist/3.40.0/docker-compose.yml b/apps/alist/3.40.0/docker-compose.yml index 9f247544..4e708409 100644 --- a/apps/alist/3.40.0/docker-compose.yml +++ b/apps/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/apps/alist/3.40.0/scripts/init.sh b/apps/alist/3.40.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/alist/3.40.0/scripts/init.sh +++ b/apps/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/apps/alist/3.40.0/scripts/upgrade.sh b/apps/alist/3.40.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/alist/3.40.0/scripts/upgrade.sh +++ b/apps/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/apps/ani-rss/1.1.202/docker-compose.yml b/apps/ani-rss/1.1.202/docker-compose.yml index 809143e0..acc595a8 100644 --- a/apps/ani-rss/1.1.202/docker-compose.yml +++ b/apps/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/apps/ani-rss/1.1.202/scripts/init.sh b/apps/ani-rss/1.1.202/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/ani-rss/1.1.202/scripts/init.sh +++ b/apps/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/apps/ani-rss/1.1.202/scripts/upgrade.sh b/apps/ani-rss/1.1.202/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/ani-rss/1.1.202/scripts/upgrade.sh +++ b/apps/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/apps/ani-rss/README.md b/apps/ani-rss/README.md index b7f5eb97..7d449587 100644 --- a/apps/ani-rss/README.md +++ b/apps/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/apps/artalk/2.9.1/docker-compose.yml b/apps/artalk/2.9.1/docker-compose.yml index 3662c36d..65fc901b 100644 --- a/apps/artalk/2.9.1/docker-compose.yml +++ b/apps/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/apps/artalk/2.9.1/scripts/init.sh b/apps/artalk/2.9.1/scripts/init.sh index 2b0096c5..5e9dcca0 100644 --- a/apps/artalk/2.9.1/scripts/init.sh +++ b/apps/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/apps/artalk/2.9.1/scripts/upgrade.sh b/apps/artalk/2.9.1/scripts/upgrade.sh index 2b0096c5..5e9dcca0 100644 --- a/apps/artalk/2.9.1/scripts/upgrade.sh +++ b/apps/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/apps/auto-lady/1.1.202/docker-compose.yml b/apps/auto-lady/1.1.202/docker-compose.yml index 69613b1b..54016fad 100644 --- a/apps/auto-lady/1.1.202/docker-compose.yml +++ b/apps/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/apps/auto-lady/1.1.202/scripts/init.sh b/apps/auto-lady/1.1.202/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/auto-lady/1.1.202/scripts/init.sh +++ b/apps/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/apps/auto-lady/1.1.202/scripts/upgrade.sh b/apps/auto-lady/1.1.202/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/auto-lady/1.1.202/scripts/upgrade.sh +++ b/apps/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/apps/auto-lady/README.md b/apps/auto-lady/README.md index ba461b04..9f9b4255 100644 --- a/apps/auto-lady/README.md +++ b/apps/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/apps/baota/9.0/docker-compose.yml b/apps/baota/9.0/docker-compose.yml index ac9b1955..41405008 100644 --- a/apps/baota/9.0/docker-compose.yml +++ b/apps/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/apps/baota/9.0/scripts/init.sh b/apps/baota/9.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/baota/9.0/scripts/init.sh +++ b/apps/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/apps/baota/9.0/scripts/upgrade.sh b/apps/baota/9.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/baota/9.0/scripts/upgrade.sh +++ b/apps/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/apps/bark/2.1.5/docker-compose.yml b/apps/bark/2.1.5/docker-compose.yml index dee00ec1..2621737f 100644 --- a/apps/bark/2.1.5/docker-compose.yml +++ b/apps/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/apps/bark/2.1.5/scripts/init.sh b/apps/bark/2.1.5/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/bark/2.1.5/scripts/init.sh +++ b/apps/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/apps/bark/2.1.5/scripts/upgrade.sh b/apps/bark/2.1.5/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/bark/2.1.5/scripts/upgrade.sh +++ b/apps/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/apps/bitmagnet/0.9.5/docker-compose.yml b/apps/bitmagnet/0.9.5/docker-compose.yml index 3cddf4ae..3da4583e 100644 --- a/apps/bitmagnet/0.9.5/docker-compose.yml +++ b/apps/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/apps/bitmagnet/0.9.5/scripts/init.sh b/apps/bitmagnet/0.9.5/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/bitmagnet/0.9.5/scripts/init.sh +++ b/apps/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/apps/bitmagnet/0.9.5/scripts/upgrade.sh b/apps/bitmagnet/0.9.5/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/bitmagnet/0.9.5/scripts/upgrade.sh +++ b/apps/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/apps/casdoor/1.758.0/docker-compose.yml b/apps/casdoor/1.758.0/docker-compose.yml index 656ad3e5..b60ed2b9 100644 --- a/apps/casdoor/1.758.0/docker-compose.yml +++ b/apps/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/apps/casdoor/1.758.0/envs/casdoor.env b/apps/casdoor/1.758.0/envs/casdoor.env new file mode 100644 index 00000000..cb7db866 --- /dev/null +++ b/apps/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/apps/casdoor/1.758.0/envs/default.env b/apps/casdoor/1.758.0/envs/default.env new file mode 100644 index 00000000..cd05f46e --- /dev/null +++ b/apps/casdoor/1.758.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/casdoor/1.758.0/envs/global.env b/apps/casdoor/1.758.0/envs/global.env new file mode 100644 index 00000000..e10989fe --- /dev/null +++ b/apps/casdoor/1.758.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/casdoor/1.758.0/scripts/init.sh b/apps/casdoor/1.758.0/scripts/init.sh index dea3fb17..cbf317ef 100644 --- a/apps/casdoor/1.758.0/scripts/init.sh +++ b/apps/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/apps/casdoor/1.758.0/scripts/upgrade.sh b/apps/casdoor/1.758.0/scripts/upgrade.sh index 77b84912..e32cd1c6 100644 --- a/apps/casdoor/1.758.0/scripts/upgrade.sh +++ b/apps/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/apps/certimate/0.2.21/docker-compose.yml b/apps/certimate/0.2.21/docker-compose.yml index 92e2ae1f..0f5f5628 100644 --- a/apps/certimate/0.2.21/docker-compose.yml +++ b/apps/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/apps/certimate/0.2.21/scripts/init.sh b/apps/certimate/0.2.21/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/certimate/0.2.21/scripts/init.sh +++ b/apps/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/apps/certimate/0.2.21/scripts/upgrade.sh b/apps/certimate/0.2.21/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/certimate/0.2.21/scripts/upgrade.sh +++ b/apps/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/apps/cookie-cloud/latest/docker-compose.yml b/apps/cookie-cloud/latest/docker-compose.yml index 60adfef9..18e45935 100644 --- a/apps/cookie-cloud/latest/docker-compose.yml +++ b/apps/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/apps/cookie-cloud/latest/scripts/init.sh b/apps/cookie-cloud/latest/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/cookie-cloud/latest/scripts/init.sh +++ b/apps/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/apps/cookie-cloud/latest/scripts/upgrade.sh b/apps/cookie-cloud/latest/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/cookie-cloud/latest/scripts/upgrade.sh +++ b/apps/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/apps/deeplx/0.9.8.3/docker-compose.yml b/apps/deeplx/0.9.8.3/docker-compose.yml index 53765461..9bb2f2fe 100644 --- a/apps/deeplx/0.9.8.3/docker-compose.yml +++ b/apps/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/apps/deeplx/0.9.8.3/scripts/init.sh b/apps/deeplx/0.9.8.3/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/deeplx/0.9.8.3/scripts/init.sh +++ b/apps/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/apps/deeplx/0.9.8.3/scripts/upgrade.sh b/apps/deeplx/0.9.8.3/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/deeplx/0.9.8.3/scripts/upgrade.sh +++ b/apps/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/apps/dockge/1.4.2/docker-compose.yml b/apps/dockge/1.4.2/docker-compose.yml index 808d6318..aa93e416 100644 --- a/apps/dockge/1.4.2/docker-compose.yml +++ b/apps/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/apps/dockge/1.4.2/scripts/init.sh b/apps/dockge/1.4.2/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/dockge/1.4.2/scripts/init.sh +++ b/apps/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/apps/dockge/1.4.2/scripts/upgrade.sh b/apps/dockge/1.4.2/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/dockge/1.4.2/scripts/upgrade.sh +++ b/apps/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/apps/dozzle/8.8.2/docker-compose.yml b/apps/dozzle/8.8.2/docker-compose.yml index 5cf7d2fc..162714be 100644 --- a/apps/dozzle/8.8.2/docker-compose.yml +++ b/apps/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/apps/dozzle/8.8.2/scripts/init.sh b/apps/dozzle/8.8.2/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/dozzle/8.8.2/scripts/init.sh +++ b/apps/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/apps/dozzle/8.8.2/scripts/upgrade.sh b/apps/dozzle/8.8.2/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/dozzle/8.8.2/scripts/upgrade.sh +++ b/apps/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/apps/dpanel-lite/1.2.6/docker-compose.yml b/apps/dpanel-lite/1.2.6/docker-compose.yml index d7bacf7a..faa00d67 100644 --- a/apps/dpanel-lite/1.2.6/docker-compose.yml +++ b/apps/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/apps/dpanel-lite/1.2.6/scripts/init.sh b/apps/dpanel-lite/1.2.6/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/dpanel-lite/1.2.6/scripts/init.sh +++ b/apps/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/apps/dpanel-lite/1.2.6/scripts/upgrade.sh b/apps/dpanel-lite/1.2.6/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/dpanel-lite/1.2.6/scripts/upgrade.sh +++ b/apps/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/apps/dpanel/1.2.6/docker-compose.yml b/apps/dpanel/1.2.6/docker-compose.yml index 7cc17d1a..5fd21acf 100644 --- a/apps/dpanel/1.2.6/docker-compose.yml +++ b/apps/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/apps/dpanel/1.2.6/scripts/init.sh b/apps/dpanel/1.2.6/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/dpanel/1.2.6/scripts/init.sh +++ b/apps/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/apps/dpanel/1.2.6/scripts/upgrade.sh b/apps/dpanel/1.2.6/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/dpanel/1.2.6/scripts/upgrade.sh +++ b/apps/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/apps/dujiaoka/2.0.9/docker-compose.yml b/apps/dujiaoka/2.0.9/docker-compose.yml index 311ff6e0..410ccdfd 100644 --- a/apps/dujiaoka/2.0.9/docker-compose.yml +++ b/apps/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/apps/dujiaoka/2.0.9/scripts/init.sh b/apps/dujiaoka/2.0.9/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/dujiaoka/2.0.9/scripts/init.sh +++ b/apps/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/apps/dujiaoka/2.0.9/scripts/upgrade.sh b/apps/dujiaoka/2.0.9/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/dujiaoka/2.0.9/scripts/upgrade.sh +++ b/apps/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/apps/elastic-elasticsearch/8.16.1/docker-compose.yml b/apps/elastic-elasticsearch/8.16.1/docker-compose.yml index 90f1ab63..5382c493 100644 --- a/apps/elastic-elasticsearch/8.16.1/docker-compose.yml +++ b/apps/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/apps/elastic-elasticsearch/8.16.1/scripts/init.sh b/apps/elastic-elasticsearch/8.16.1/scripts/init.sh index c5dbe273..33a7b7f4 100644 --- a/apps/elastic-elasticsearch/8.16.1/scripts/init.sh +++ b/apps/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/apps/elastic-elasticsearch/8.16.1/scripts/upgrade.sh b/apps/elastic-elasticsearch/8.16.1/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/elastic-elasticsearch/8.16.1/scripts/upgrade.sh +++ b/apps/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/apps/elastic-kibana/8.16.1/docker-compose.yml b/apps/elastic-kibana/8.16.1/docker-compose.yml index 29f8b7a1..161e0905 100644 --- a/apps/elastic-kibana/8.16.1/docker-compose.yml +++ b/apps/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/apps/elastic-kibana/8.16.1/scripts/init.sh b/apps/elastic-kibana/8.16.1/scripts/init.sh index 98e49fa6..f68fbe6d 100644 --- a/apps/elastic-kibana/8.16.1/scripts/init.sh +++ b/apps/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/apps/elastic-kibana/8.16.1/scripts/upgrade.sh b/apps/elastic-kibana/8.16.1/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/elastic-kibana/8.16.1/scripts/upgrade.sh +++ b/apps/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/apps/element-web/1.11.86/docker-compose.yml b/apps/element-web/1.11.86/docker-compose.yml index 5a7e24e0..b6310049 100644 --- a/apps/element-web/1.11.86/docker-compose.yml +++ b/apps/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/apps/element-web/1.11.86/scripts/init.sh b/apps/element-web/1.11.86/scripts/init.sh index cd438466..65e20abf 100644 --- a/apps/element-web/1.11.86/scripts/init.sh +++ b/apps/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/apps/element-web/1.11.86/scripts/upgrade.sh b/apps/element-web/1.11.86/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/element-web/1.11.86/scripts/upgrade.sh +++ b/apps/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/apps/emby-amilys/4.8.9.0/scripts/init.sh b/apps/emby-amilys/4.8.9.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/emby-amilys/4.8.9.0/scripts/init.sh +++ b/apps/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/apps/emby-amilys/4.8.9.0/scripts/upgrade.sh b/apps/emby-amilys/4.8.9.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/emby-amilys/4.8.9.0/scripts/upgrade.sh +++ b/apps/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/apps/emby-lovechen/4.8.0.21/scripts/init.sh b/apps/emby-lovechen/4.8.0.21/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/emby-lovechen/4.8.0.21/scripts/init.sh +++ b/apps/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/apps/emby-lovechen/4.8.0.21/scripts/upgrade.sh b/apps/emby-lovechen/4.8.0.21/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/emby-lovechen/4.8.0.21/scripts/upgrade.sh +++ b/apps/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/apps/emby/4.8.10.0/scripts/init.sh b/apps/emby/4.8.10.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/emby/4.8.10.0/scripts/init.sh +++ b/apps/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/apps/emby/4.8.10.0/scripts/upgrade.sh b/apps/emby/4.8.10.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/emby/4.8.10.0/scripts/upgrade.sh +++ b/apps/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/apps/ghost/5.101.4/docker-compose.yml b/apps/ghost/5.101.4/docker-compose.yml index 0e545191..74547852 100644 --- a/apps/ghost/5.101.4/docker-compose.yml +++ b/apps/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/apps/ghost/5.101.4/scripts/init.sh b/apps/ghost/5.101.4/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/ghost/5.101.4/scripts/init.sh +++ b/apps/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/apps/ghost/5.101.4/scripts/upgrade.sh b/apps/ghost/5.101.4/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/ghost/5.101.4/scripts/upgrade.sh +++ b/apps/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/apps/gitea-runner/0.2.11/docker-compose.yml b/apps/gitea-runner/0.2.11/docker-compose.yml index d1205510..dcd12c17 100644 --- a/apps/gitea-runner/0.2.11/docker-compose.yml +++ b/apps/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/apps/gitea/1.22.4/docker-compose.yml b/apps/gitea/1.22.4/docker-compose.yml index 33ba8c8f..81d46f03 100644 --- a/apps/gitea/1.22.4/docker-compose.yml +++ b/apps/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/apps/gitea/1.22.4/scripts/init.sh b/apps/gitea/1.22.4/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/gitea/1.22.4/scripts/init.sh +++ b/apps/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/apps/gitea/1.22.4/scripts/upgrade.sh b/apps/gitea/1.22.4/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/gitea/1.22.4/scripts/upgrade.sh +++ b/apps/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/apps/halo/2.20.10/scripts/init.sh b/apps/halo/2.20.10/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/halo/2.20.10/scripts/init.sh +++ b/apps/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/apps/halo/2.20.10/scripts/upgrade.sh b/apps/halo/2.20.10/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/halo/2.20.10/scripts/upgrade.sh +++ b/apps/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/apps/iframely/2.4.3/docker-compose.yml b/apps/iframely/2.4.3/docker-compose.yml index 0a17e891..520e6c52 100644 --- a/apps/iframely/2.4.3/docker-compose.yml +++ b/apps/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/apps/iframely/2.4.3/scripts/init.sh b/apps/iframely/2.4.3/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/iframely/2.4.3/scripts/init.sh +++ b/apps/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/apps/iframely/2.4.3/scripts/upgrade.sh b/apps/iframely/2.4.3/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/iframely/2.4.3/scripts/upgrade.sh +++ b/apps/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/apps/immich-machine-learning/1.121.0/docker-compose.yml b/apps/immich-machine-learning/1.121.0/docker-compose.yml index 8ca588f4..69a8f942 100644 --- a/apps/immich-machine-learning/1.121.0/docker-compose.yml +++ b/apps/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/apps/immich-machine-learning/1.121.0/scripts/init.sh b/apps/immich-machine-learning/1.121.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/immich-machine-learning/1.121.0/scripts/init.sh +++ b/apps/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/apps/immich-machine-learning/1.121.0/scripts/upgrade.sh b/apps/immich-machine-learning/1.121.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/immich-machine-learning/1.121.0/scripts/upgrade.sh +++ b/apps/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/apps/immich-server/1.121.0/docker-compose.yml b/apps/immich-server/1.121.0/docker-compose.yml index 3401114a..0df36f0e 100644 --- a/apps/immich-server/1.121.0/docker-compose.yml +++ b/apps/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/apps/immich-server/1.121.0/scripts/init.sh b/apps/immich-server/1.121.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/immich-server/1.121.0/scripts/init.sh +++ b/apps/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/apps/immich-server/1.121.0/scripts/upgrade.sh b/apps/immich-server/1.121.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/immich-server/1.121.0/scripts/upgrade.sh +++ b/apps/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/apps/immich/1.121.0/docker-compose.yml b/apps/immich/1.121.0/docker-compose.yml index a5f0f1a2..f6b81f43 100644 --- a/apps/immich/1.121.0/docker-compose.yml +++ b/apps/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/apps/immich/1.121.0/scripts/init.sh b/apps/immich/1.121.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/immich/1.121.0/scripts/init.sh +++ b/apps/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/apps/immich/1.121.0/scripts/upgrade.sh b/apps/immich/1.121.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/immich/1.121.0/scripts/upgrade.sh +++ b/apps/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/apps/iycms/3.3.44/docker-compose.yml b/apps/iycms/3.3.44/docker-compose.yml index 6e11a743..007b04d1 100644 --- a/apps/iycms/3.3.44/docker-compose.yml +++ b/apps/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/apps/iycms/3.3.44/scripts/init.sh b/apps/iycms/3.3.44/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/iycms/3.3.44/scripts/init.sh +++ b/apps/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/apps/iycms/3.3.44/scripts/upgrade.sh b/apps/iycms/3.3.44/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/iycms/3.3.44/scripts/upgrade.sh +++ b/apps/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/apps/jellyseerr/2.1.0/docker-compose.yml b/apps/jellyseerr/2.1.0/docker-compose.yml index b83a8a99..17eb649f 100644 --- a/apps/jellyseerr/2.1.0/docker-compose.yml +++ b/apps/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/apps/jellyseerr/2.1.0/scripts/init.sh b/apps/jellyseerr/2.1.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/jellyseerr/2.1.0/scripts/init.sh +++ b/apps/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/apps/jellyseerr/2.1.0/scripts/upgrade.sh b/apps/jellyseerr/2.1.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/jellyseerr/2.1.0/scripts/upgrade.sh +++ b/apps/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/apps/jproxy/3.4.4/docker-compose.yml b/apps/jproxy/3.4.4/docker-compose.yml index ba213200..0e57d2e6 100644 --- a/apps/jproxy/3.4.4/docker-compose.yml +++ b/apps/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/apps/jproxy/3.4.4/scripts/init.sh b/apps/jproxy/3.4.4/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/jproxy/3.4.4/scripts/init.sh +++ b/apps/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/apps/jproxy/3.4.4/scripts/upgrade.sh b/apps/jproxy/3.4.4/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/jproxy/3.4.4/scripts/upgrade.sh +++ b/apps/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/apps/kimai/2.23.0/docker-compose.yml b/apps/kimai/2.23.0/docker-compose.yml index 0a46b5aa..5d7846b7 100644 --- a/apps/kimai/2.23.0/docker-compose.yml +++ b/apps/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/apps/kimai/2.23.0/scripts/init.sh b/apps/kimai/2.23.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/kimai/2.23.0/scripts/init.sh +++ b/apps/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/apps/kimai/2.23.0/scripts/upgrade.sh b/apps/kimai/2.23.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/kimai/2.23.0/scripts/upgrade.sh +++ b/apps/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/apps/limesurvey/6.6.5/docker-compose.yml b/apps/limesurvey/6.6.5/docker-compose.yml index 0eb02680..6bdeae63 100644 --- a/apps/limesurvey/6.6.5/docker-compose.yml +++ b/apps/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/apps/limesurvey/6.6.5/scripts/init.sh b/apps/limesurvey/6.6.5/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/limesurvey/6.6.5/scripts/init.sh +++ b/apps/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/apps/limesurvey/6.6.5/scripts/upgrade.sh b/apps/limesurvey/6.6.5/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/limesurvey/6.6.5/scripts/upgrade.sh +++ b/apps/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/apps/linkding/1.36.0/docker-compose.yml b/apps/linkding/1.36.0/docker-compose.yml index 368e86b0..3dba9799 100644 --- a/apps/linkding/1.36.0/docker-compose.yml +++ b/apps/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/apps/linkding/1.36.0/scripts/init.sh b/apps/linkding/1.36.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/linkding/1.36.0/scripts/init.sh +++ b/apps/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/apps/linkding/1.36.0/scripts/upgrade.sh b/apps/linkding/1.36.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/linkding/1.36.0/scripts/upgrade.sh +++ b/apps/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/apps/maccms10/24.11.19/docker-compose.yml b/apps/maccms10/24.11.19/docker-compose.yml index cddca795..d44f4c20 100644 --- a/apps/maccms10/24.11.19/docker-compose.yml +++ b/apps/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/apps/maccms10/24.11.19/scripts/init.sh b/apps/maccms10/24.11.19/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/maccms10/24.11.19/scripts/init.sh +++ b/apps/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/apps/maccms10/24.11.19/scripts/upgrade.sh b/apps/maccms10/24.11.19/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/maccms10/24.11.19/scripts/upgrade.sh +++ b/apps/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/apps/macos/1.16/docker-compose.yml b/apps/macos/1.16/docker-compose.yml index c42bb681..5a81d6bd 100644 --- a/apps/macos/1.16/docker-compose.yml +++ b/apps/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/apps/macos/1.16/scripts/init.sh b/apps/macos/1.16/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/macos/1.16/scripts/init.sh +++ b/apps/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/apps/macos/1.16/scripts/upgrade.sh b/apps/macos/1.16/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/macos/1.16/scripts/upgrade.sh +++ b/apps/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/apps/mailserver/14.0.0/docker-compose.yml b/apps/mailserver/14.0.0/docker-compose.yml index d183ba06..c9812553 100644 --- a/apps/mailserver/14.0.0/docker-compose.yml +++ b/apps/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/apps/mailserver/14.0.0/scripts/init.sh b/apps/mailserver/14.0.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/mailserver/14.0.0/scripts/init.sh +++ b/apps/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/apps/mailserver/14.0.0/scripts/upgrade.sh b/apps/mailserver/14.0.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/mailserver/14.0.0/scripts/upgrade.sh +++ b/apps/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/apps/mariadb/11.6.2/docker-compose.yml b/apps/mariadb/11.6.2/docker-compose.yml index c98cbb94..6efcc9f8 100644 --- a/apps/mariadb/11.6.2/docker-compose.yml +++ b/apps/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/apps/mariadb/11.6.2/scripts/init.sh b/apps/mariadb/11.6.2/scripts/init.sh index fb017c6c..4d148914 100644 --- a/apps/mariadb/11.6.2/scripts/init.sh +++ b/apps/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/apps/mariadb/11.6.2/scripts/upgrade.sh b/apps/mariadb/11.6.2/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/mariadb/11.6.2/scripts/upgrade.sh +++ b/apps/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/apps/maxkb/1.7.2/docker-compose.yml b/apps/maxkb/1.7.2/docker-compose.yml index 49962edd..d59086e5 100644 --- a/apps/maxkb/1.7.2/docker-compose.yml +++ b/apps/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/apps/maxkb/1.7.2/scripts/init.sh b/apps/maxkb/1.7.2/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/maxkb/1.7.2/scripts/init.sh +++ b/apps/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/apps/maxkb/1.7.2/scripts/upgrade.sh b/apps/maxkb/1.7.2/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/maxkb/1.7.2/scripts/upgrade.sh +++ b/apps/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/apps/mcy-shop/5.0.17/docker-compose.yml b/apps/mcy-shop/5.0.17/docker-compose.yml index f129d7e5..102d471a 100644 --- a/apps/mcy-shop/5.0.17/docker-compose.yml +++ b/apps/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/apps/mcy-shop/5.0.17/scripts/init.sh b/apps/mcy-shop/5.0.17/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/mcy-shop/5.0.17/scripts/init.sh +++ b/apps/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/apps/mcy-shop/5.0.17/scripts/upgrade.sh b/apps/mcy-shop/5.0.17/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/mcy-shop/5.0.17/scripts/upgrade.sh +++ b/apps/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/apps/mediacms/4.1.0/docker-compose.yml b/apps/mediacms/4.1.0/docker-compose.yml index cff4154f..3c689fad 100644 --- a/apps/mediacms/4.1.0/docker-compose.yml +++ b/apps/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/apps/mediacms/4.1.0/scripts/init.sh b/apps/mediacms/4.1.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/mediacms/4.1.0/scripts/init.sh +++ b/apps/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/apps/mediacms/4.1.0/scripts/upgrade.sh b/apps/mediacms/4.1.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/mediacms/4.1.0/scripts/upgrade.sh +++ b/apps/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/apps/minio/2024-11-07/docker-compose.yml b/apps/minio/2024-11-07/docker-compose.yml index 5859c9bb..a0ff7df1 100644 --- a/apps/minio/2024-11-07/docker-compose.yml +++ b/apps/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/apps/minio/2024-11-07/scripts/init.sh b/apps/minio/2024-11-07/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/minio/2024-11-07/scripts/init.sh +++ b/apps/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/apps/minio/2024-11-07/scripts/upgrade.sh b/apps/minio/2024-11-07/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/minio/2024-11-07/scripts/upgrade.sh +++ b/apps/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/apps/movie-pilot/1.9.17/docker-compose.yml b/apps/movie-pilot/1.9.17/docker-compose.yml index be5b28d4..3a66684b 100644 --- a/apps/movie-pilot/1.9.17/docker-compose.yml +++ b/apps/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/apps/movie-pilot/1.9.17/scripts/init.sh b/apps/movie-pilot/1.9.17/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/movie-pilot/1.9.17/scripts/init.sh +++ b/apps/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/apps/movie-pilot/1.9.17/scripts/upgrade.sh b/apps/movie-pilot/1.9.17/scripts/upgrade.sh index 2df25115..4219e7b6 100644 --- a/apps/movie-pilot/1.9.17/scripts/upgrade.sh +++ b/apps/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/apps/movie-pilot/2.1.0/docker-compose.yml b/apps/movie-pilot/2.1.0/docker-compose.yml index 707c1c02..d391cd00 100644 --- a/apps/movie-pilot/2.1.0/docker-compose.yml +++ b/apps/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/apps/movie-pilot/2.1.0/scripts/init.sh b/apps/movie-pilot/2.1.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/movie-pilot/2.1.0/scripts/init.sh +++ b/apps/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/apps/movie-pilot/2.1.0/scripts/upgrade.sh b/apps/movie-pilot/2.1.0/scripts/upgrade.sh index 2df25115..4219e7b6 100644 --- a/apps/movie-pilot/2.1.0/scripts/upgrade.sh +++ b/apps/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/apps/mysql/5.7.44/docker-compose.yml b/apps/mysql/5.7.44/docker-compose.yml index 6c767540..7385b216 100644 --- a/apps/mysql/5.7.44/docker-compose.yml +++ b/apps/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/apps/mysql/5.7.44/scripts/init.sh b/apps/mysql/5.7.44/scripts/init.sh index 5a20b970..1cdd90c2 100644 --- a/apps/mysql/5.7.44/scripts/init.sh +++ b/apps/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/apps/mysql/5.7.44/scripts/upgrade.sh b/apps/mysql/5.7.44/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/mysql/5.7.44/scripts/upgrade.sh +++ b/apps/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/apps/mysql/8.4.3/docker-compose.yml b/apps/mysql/8.4.3/docker-compose.yml index b991b12a..af56485d 100644 --- a/apps/mysql/8.4.3/docker-compose.yml +++ b/apps/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/apps/mysql/8.4.3/scripts/init.sh b/apps/mysql/8.4.3/scripts/init.sh index 5a20b970..1cdd90c2 100644 --- a/apps/mysql/8.4.3/scripts/init.sh +++ b/apps/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/apps/mysql/8.4.3/scripts/upgrade.sh b/apps/mysql/8.4.3/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/mysql/8.4.3/scripts/upgrade.sh +++ b/apps/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/apps/nacos/2.4.3/docker-compose.yml b/apps/nacos/2.4.3/docker-compose.yml index 262bf684..f574f587 100644 --- a/apps/nacos/2.4.3/docker-compose.yml +++ b/apps/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/apps/nacos/2.4.3/scripts/init.sh b/apps/nacos/2.4.3/scripts/init.sh index e13cf8c7..19193ac7 100644 --- a/apps/nacos/2.4.3/scripts/init.sh +++ b/apps/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/apps/nacos/2.4.3/scripts/upgrade.sh b/apps/nacos/2.4.3/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/nacos/2.4.3/scripts/upgrade.sh +++ b/apps/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/apps/nexusphp/1.8.16/docker-compose.yml b/apps/nexusphp/1.8.16/docker-compose.yml index 4648964b..0a6fe9a5 100644 --- a/apps/nexusphp/1.8.16/docker-compose.yml +++ b/apps/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/apps/nexusphp/1.8.16/scripts/init.sh b/apps/nexusphp/1.8.16/scripts/init.sh index fc799a88..1cea64e0 100644 --- a/apps/nexusphp/1.8.16/scripts/init.sh +++ b/apps/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/apps/nexusphp/1.8.16/scripts/upgrade.sh b/apps/nexusphp/1.8.16/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/nexusphp/1.8.16/scripts/upgrade.sh +++ b/apps/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/apps/nezha-dash/1.5.2/docker-compose.yml b/apps/nezha-dash/1.5.2/docker-compose.yml index a4f92dd7..0a3bb3f0 100644 --- a/apps/nezha-dash/1.5.2/docker-compose.yml +++ b/apps/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/apps/nezha-dash/1.5.2/scripts/init.sh b/apps/nezha-dash/1.5.2/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/nezha-dash/1.5.2/scripts/init.sh +++ b/apps/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/apps/nezha-dash/1.5.2/scripts/upgrade.sh b/apps/nezha-dash/1.5.2/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/nezha-dash/1.5.2/scripts/upgrade.sh +++ b/apps/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/apps/nginx-ui/2.0.0/docker-compose.yml b/apps/nginx-ui/2.0.0/docker-compose.yml index a2966e1f..3033ba22 100644 --- a/apps/nginx-ui/2.0.0/docker-compose.yml +++ b/apps/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/apps/nginx-ui/2.0.0/scripts/init.sh b/apps/nginx-ui/2.0.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/nginx-ui/2.0.0/scripts/init.sh +++ b/apps/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/apps/nginx-ui/2.0.0/scripts/upgrade.sh b/apps/nginx-ui/2.0.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/nginx-ui/2.0.0/scripts/upgrade.sh +++ b/apps/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/apps/nocodb/0.258.2/docker-compose.yml b/apps/nocodb/0.258.2/docker-compose.yml index dd6f0db7..38a4491e 100644 --- a/apps/nocodb/0.258.2/docker-compose.yml +++ b/apps/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/apps/nocodb/0.258.2/scripts/init.sh b/apps/nocodb/0.258.2/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/nocodb/0.258.2/scripts/init.sh +++ b/apps/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/apps/nocodb/0.258.2/scripts/upgrade.sh b/apps/nocodb/0.258.2/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/nocodb/0.258.2/scripts/upgrade.sh +++ b/apps/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/apps/onedev/11.5.3/docker-compose.yml b/apps/onedev/11.5.3/docker-compose.yml index 4e496d6f..e234496e 100644 --- a/apps/onedev/11.5.3/docker-compose.yml +++ b/apps/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/apps/onedev/11.5.3/scripts/init.sh b/apps/onedev/11.5.3/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/onedev/11.5.3/scripts/init.sh +++ b/apps/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/apps/onedev/11.5.3/scripts/upgrade.sh b/apps/onedev/11.5.3/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/onedev/11.5.3/scripts/upgrade.sh +++ b/apps/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/apps/openfire/4.9.0/docker-compose.yml b/apps/openfire/4.9.0/docker-compose.yml index 243e458b..8a152afb 100644 --- a/apps/openfire/4.9.0/docker-compose.yml +++ b/apps/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/apps/openfire/4.9.0/scripts/init.sh b/apps/openfire/4.9.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/openfire/4.9.0/scripts/init.sh +++ b/apps/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/apps/openfire/4.9.0/scripts/upgrade.sh b/apps/openfire/4.9.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/openfire/4.9.0/scripts/upgrade.sh +++ b/apps/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/apps/outline/0.81.1/docker-compose.yml b/apps/outline/0.81.1/docker-compose.yml index 503ffda8..64997429 100644 --- a/apps/outline/0.81.1/docker-compose.yml +++ b/apps/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/apps/outline/0.81.1/scripts/init.sh b/apps/outline/0.81.1/scripts/init.sh index b71a9adc..98e6d8cf 100644 --- a/apps/outline/0.81.1/scripts/init.sh +++ b/apps/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/apps/outline/0.81.1/scripts/upgrade.sh b/apps/outline/0.81.1/scripts/upgrade.sh index 70ba8d3d..bbf16631 100644 --- a/apps/outline/0.81.1/scripts/upgrade.sh +++ b/apps/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/apps/page-spy-web/1.9.6/docker-compose.yml b/apps/page-spy-web/1.9.6/docker-compose.yml index b7e11c35..d098eeff 100644 --- a/apps/page-spy-web/1.9.6/docker-compose.yml +++ b/apps/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/apps/page-spy-web/1.9.6/scripts/init.sh b/apps/page-spy-web/1.9.6/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/page-spy-web/1.9.6/scripts/init.sh +++ b/apps/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/apps/page-spy-web/1.9.6/scripts/upgrade.sh b/apps/page-spy-web/1.9.6/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/page-spy-web/1.9.6/scripts/upgrade.sh +++ b/apps/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/apps/percona/8.0/docker-compose.yml b/apps/percona/8.0/docker-compose.yml index 83a31a26..91d9b6ee 100644 --- a/apps/percona/8.0/docker-compose.yml +++ b/apps/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/apps/percona/8.0/scripts/init.sh b/apps/percona/8.0/scripts/init.sh index 5179ad72..ae47f700 100644 --- a/apps/percona/8.0/scripts/init.sh +++ b/apps/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/apps/percona/8.0/scripts/upgrade.sh b/apps/percona/8.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/percona/8.0/scripts/upgrade.sh +++ b/apps/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/apps/photoprism/240915/docker-compose.yml b/apps/photoprism/240915/docker-compose.yml index 873fc9d5..89080c20 100644 --- a/apps/photoprism/240915/docker-compose.yml +++ b/apps/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/apps/photoprism/240915/scripts/init.sh b/apps/photoprism/240915/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/photoprism/240915/scripts/init.sh +++ b/apps/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/apps/photoprism/240915/scripts/upgrade.sh b/apps/photoprism/240915/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/photoprism/240915/scripts/upgrade.sh +++ b/apps/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/apps/pingvin-share/1.6.1/docker-compose.yml b/apps/pingvin-share/1.6.1/docker-compose.yml index 23c78f31..4eaec5ba 100644 --- a/apps/pingvin-share/1.6.1/docker-compose.yml +++ b/apps/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/apps/pingvin-share/1.6.1/scripts/init.sh b/apps/pingvin-share/1.6.1/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/pingvin-share/1.6.1/scripts/init.sh +++ b/apps/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/apps/pingvin-share/1.6.1/scripts/upgrade.sh b/apps/pingvin-share/1.6.1/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/pingvin-share/1.6.1/scripts/upgrade.sh +++ b/apps/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/apps/pixman/1.8.2/docker-compose.yml b/apps/pixman/1.8.2/docker-compose.yml index 2e135c25..2a280d4b 100644 --- a/apps/pixman/1.8.2/docker-compose.yml +++ b/apps/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/apps/pixman/1.8.2/scripts/init.sh b/apps/pixman/1.8.2/scripts/init.sh index f3ec51b1..a33a4a55 100644 --- a/apps/pixman/1.8.2/scripts/init.sh +++ b/apps/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/apps/pixman/1.8.2/scripts/upgrade.sh b/apps/pixman/1.8.2/scripts/upgrade.sh index f3ec51b1..a33a4a55 100644 --- a/apps/pixman/1.8.2/scripts/upgrade.sh +++ b/apps/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/apps/postgresql/16.6-alpine/docker-compose.yml b/apps/postgresql/16.6-alpine/docker-compose.yml index 1cf2dd58..f1c8fade 100644 --- a/apps/postgresql/16.6-alpine/docker-compose.yml +++ b/apps/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/apps/postgresql/16.6-alpine/scripts/init.sh b/apps/postgresql/16.6-alpine/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/16.6-alpine/scripts/init.sh +++ b/apps/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/apps/postgresql/16.6-alpine/scripts/upgrade.sh b/apps/postgresql/16.6-alpine/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/16.6-alpine/scripts/upgrade.sh +++ b/apps/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/apps/postgresql/16.6/docker-compose.yml b/apps/postgresql/16.6/docker-compose.yml index 5eaa1e4c..eb4e95f9 100644 --- a/apps/postgresql/16.6/docker-compose.yml +++ b/apps/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/apps/postgresql/16.6/scripts/init.sh b/apps/postgresql/16.6/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/16.6/scripts/init.sh +++ b/apps/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/apps/postgresql/16.6/scripts/upgrade.sh b/apps/postgresql/16.6/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/16.6/scripts/upgrade.sh +++ b/apps/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/apps/postgresql/17.2-alpine/docker-compose.yml b/apps/postgresql/17.2-alpine/docker-compose.yml index 5db80e74..479b68e9 100644 --- a/apps/postgresql/17.2-alpine/docker-compose.yml +++ b/apps/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/apps/postgresql/17.2-alpine/scripts/init.sh b/apps/postgresql/17.2-alpine/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/17.2-alpine/scripts/init.sh +++ b/apps/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/apps/postgresql/17.2-alpine/scripts/upgrade.sh b/apps/postgresql/17.2-alpine/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/17.2-alpine/scripts/upgrade.sh +++ b/apps/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/apps/postgresql/17.2/docker-compose.yml b/apps/postgresql/17.2/docker-compose.yml index b7d889da..de00707a 100644 --- a/apps/postgresql/17.2/docker-compose.yml +++ b/apps/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/apps/postgresql/17.2/scripts/init.sh b/apps/postgresql/17.2/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/17.2/scripts/init.sh +++ b/apps/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/apps/postgresql/17.2/scripts/upgrade.sh b/apps/postgresql/17.2/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/17.2/scripts/upgrade.sh +++ b/apps/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/apps/postgresql/pg14-alpine/docker-compose.yml b/apps/postgresql/pg14-alpine/docker-compose.yml index 038e68b1..416ad6c6 100644 --- a/apps/postgresql/pg14-alpine/docker-compose.yml +++ b/apps/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/apps/postgresql/pg14-alpine/scripts/init.sh b/apps/postgresql/pg14-alpine/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/pg14-alpine/scripts/init.sh +++ b/apps/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/apps/postgresql/pg14-alpine/scripts/upgrade.sh b/apps/postgresql/pg14-alpine/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/pg14-alpine/scripts/upgrade.sh +++ b/apps/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/apps/postgresql/pg14-vectors/docker-compose.yml b/apps/postgresql/pg14-vectors/docker-compose.yml index d5a979f9..6925a697 100644 --- a/apps/postgresql/pg14-vectors/docker-compose.yml +++ b/apps/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/apps/postgresql/pg14-vectors/scripts/init.sh b/apps/postgresql/pg14-vectors/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/pg14-vectors/scripts/init.sh +++ b/apps/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/apps/postgresql/pg14-vectors/scripts/upgrade.sh b/apps/postgresql/pg14-vectors/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/pg14-vectors/scripts/upgrade.sh +++ b/apps/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/apps/postgresql/pg14/docker-compose.yml b/apps/postgresql/pg14/docker-compose.yml index 86edcbbe..5510b8e2 100644 --- a/apps/postgresql/pg14/docker-compose.yml +++ b/apps/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/apps/postgresql/pg14/scripts/init.sh b/apps/postgresql/pg14/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/pg14/scripts/init.sh +++ b/apps/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/apps/postgresql/pg14/scripts/upgrade.sh b/apps/postgresql/pg14/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/pg14/scripts/upgrade.sh +++ b/apps/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/apps/postgresql/pg15-alpine/docker-compose.yml b/apps/postgresql/pg15-alpine/docker-compose.yml index 58128c8b..cf4f24ca 100644 --- a/apps/postgresql/pg15-alpine/docker-compose.yml +++ b/apps/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/apps/postgresql/pg15-alpine/scripts/init.sh b/apps/postgresql/pg15-alpine/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/pg15-alpine/scripts/init.sh +++ b/apps/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/apps/postgresql/pg15-alpine/scripts/upgrade.sh b/apps/postgresql/pg15-alpine/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/pg15-alpine/scripts/upgrade.sh +++ b/apps/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/apps/postgresql/pg15-vectors/docker-compose.yml b/apps/postgresql/pg15-vectors/docker-compose.yml index 422901f9..5abb791d 100644 --- a/apps/postgresql/pg15-vectors/docker-compose.yml +++ b/apps/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/apps/postgresql/pg15-vectors/scripts/init.sh b/apps/postgresql/pg15-vectors/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/pg15-vectors/scripts/init.sh +++ b/apps/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/apps/postgresql/pg15-vectors/scripts/upgrade.sh b/apps/postgresql/pg15-vectors/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/pg15-vectors/scripts/upgrade.sh +++ b/apps/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/apps/postgresql/pg15/docker-compose.yml b/apps/postgresql/pg15/docker-compose.yml index 7f2b1536..17d11df8 100644 --- a/apps/postgresql/pg15/docker-compose.yml +++ b/apps/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/apps/postgresql/pg15/scripts/init.sh b/apps/postgresql/pg15/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/pg15/scripts/init.sh +++ b/apps/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/apps/postgresql/pg15/scripts/upgrade.sh b/apps/postgresql/pg15/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/pg15/scripts/upgrade.sh +++ b/apps/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/apps/postgresql/pg16-alpine/docker-compose.yml b/apps/postgresql/pg16-alpine/docker-compose.yml index 4cd236c7..8ed2c2e6 100644 --- a/apps/postgresql/pg16-alpine/docker-compose.yml +++ b/apps/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/apps/postgresql/pg16-alpine/scripts/init.sh b/apps/postgresql/pg16-alpine/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/pg16-alpine/scripts/init.sh +++ b/apps/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/apps/postgresql/pg16-alpine/scripts/upgrade.sh b/apps/postgresql/pg16-alpine/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/pg16-alpine/scripts/upgrade.sh +++ b/apps/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/apps/postgresql/pg16-vectors/docker-compose.yml b/apps/postgresql/pg16-vectors/docker-compose.yml index b1f04ece..be4d7d9c 100644 --- a/apps/postgresql/pg16-vectors/docker-compose.yml +++ b/apps/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/apps/postgresql/pg16-vectors/scripts/init.sh b/apps/postgresql/pg16-vectors/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/pg16-vectors/scripts/init.sh +++ b/apps/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/apps/postgresql/pg16-vectors/scripts/upgrade.sh b/apps/postgresql/pg16-vectors/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/pg16-vectors/scripts/upgrade.sh +++ b/apps/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/apps/postgresql/pg16/docker-compose.yml b/apps/postgresql/pg16/docker-compose.yml index f2dce119..f186cdab 100644 --- a/apps/postgresql/pg16/docker-compose.yml +++ b/apps/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/apps/postgresql/pg16/scripts/init.sh b/apps/postgresql/pg16/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/pg16/scripts/init.sh +++ b/apps/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/apps/postgresql/pg16/scripts/upgrade.sh b/apps/postgresql/pg16/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/postgresql/pg16/scripts/upgrade.sh +++ b/apps/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/apps/prowlarr/1.27.0/docker-compose.yml b/apps/prowlarr/1.27.0/docker-compose.yml index 85e3e58b..49bb6a05 100644 --- a/apps/prowlarr/1.27.0/docker-compose.yml +++ b/apps/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/apps/prowlarr/1.27.0/scripts/init.sh b/apps/prowlarr/1.27.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/prowlarr/1.27.0/scripts/init.sh +++ b/apps/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/apps/prowlarr/1.27.0/scripts/upgrade.sh b/apps/prowlarr/1.27.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/prowlarr/1.27.0/scripts/upgrade.sh +++ b/apps/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/apps/puff/0.2.2/docker-compose.yml b/apps/puff/0.2.2/docker-compose.yml index 1d5317c8..cce843dd 100644 --- a/apps/puff/0.2.2/docker-compose.yml +++ b/apps/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/apps/puff/0.2.2/scripts/init.sh b/apps/puff/0.2.2/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/puff/0.2.2/scripts/init.sh +++ b/apps/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/apps/puff/0.2.2/scripts/upgrade.sh b/apps/puff/0.2.2/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/puff/0.2.2/scripts/upgrade.sh +++ b/apps/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/apps/qbittorrent/4.6.7/docker-compose.yml b/apps/qbittorrent/4.6.7/docker-compose.yml index c4e5f5f3..e351cac1 100644 --- a/apps/qbittorrent/4.6.7/docker-compose.yml +++ b/apps/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/apps/qbittorrent/5.0.2/docker-compose.yml b/apps/qbittorrent/5.0.2/docker-compose.yml index 2f5f6508..1397dba9 100644 --- a/apps/qbittorrent/5.0.2/docker-compose.yml +++ b/apps/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/apps/radarr/5.15.1/docker-compose.yml b/apps/radarr/5.15.1/docker-compose.yml index 4e75ec8c..069e29ea 100644 --- a/apps/radarr/5.15.1/docker-compose.yml +++ b/apps/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/apps/radarr/5.15.1/scripts/init.sh b/apps/radarr/5.15.1/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/radarr/5.15.1/scripts/init.sh +++ b/apps/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/apps/radarr/5.15.1/scripts/upgrade.sh b/apps/radarr/5.15.1/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/radarr/5.15.1/scripts/upgrade.sh +++ b/apps/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/apps/reader3-webview/3.2.0/docker-compose.yml b/apps/reader3-webview/3.2.0/docker-compose.yml index 708b7717..e1082b55 100644 --- a/apps/reader3-webview/3.2.0/docker-compose.yml +++ b/apps/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/apps/reader3/3.2.10/docker-compose.yml b/apps/reader3/3.2.10/docker-compose.yml index c256bc9b..d6602d9e 100644 --- a/apps/reader3/3.2.10/docker-compose.yml +++ b/apps/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/apps/reader3/3.2.10/scripts/init.sh b/apps/reader3/3.2.10/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/reader3/3.2.10/scripts/init.sh +++ b/apps/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/apps/reader3/3.2.10/scripts/upgrade.sh b/apps/reader3/3.2.10/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/reader3/3.2.10/scripts/upgrade.sh +++ b/apps/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/apps/rsshub/2024-11-26/docker-compose.yml b/apps/rsshub/2024-11-26/docker-compose.yml index a07f79a2..e29420a9 100644 --- a/apps/rsshub/2024-11-26/docker-compose.yml +++ b/apps/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/apps/rsshub/2024-11-26/scripts/init.sh b/apps/rsshub/2024-11-26/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/rsshub/2024-11-26/scripts/init.sh +++ b/apps/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/apps/rsshub/2024-11-26/scripts/upgrade.sh b/apps/rsshub/2024-11-26/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/rsshub/2024-11-26/scripts/upgrade.sh +++ b/apps/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/apps/sentinel/1.8.8/scripts/init.sh b/apps/sentinel/1.8.8/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/sentinel/1.8.8/scripts/init.sh +++ b/apps/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/apps/sentinel/1.8.8/scripts/upgrade.sh b/apps/sentinel/1.8.8/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/sentinel/1.8.8/scripts/upgrade.sh +++ b/apps/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/apps/shiori/1.7.1/docker-compose.yml b/apps/shiori/1.7.1/docker-compose.yml index 89b7e7df..5d0948ec 100644 --- a/apps/shiori/1.7.1/docker-compose.yml +++ b/apps/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/apps/shiori/1.7.1/scripts/init.sh b/apps/shiori/1.7.1/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/shiori/1.7.1/scripts/init.sh +++ b/apps/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/apps/shiori/1.7.1/scripts/upgrade.sh b/apps/shiori/1.7.1/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/shiori/1.7.1/scripts/upgrade.sh +++ b/apps/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/apps/siyuan/3.1.13/docker-compose.yml b/apps/siyuan/3.1.13/docker-compose.yml index 46c6b6c2..87a89a3e 100644 --- a/apps/siyuan/3.1.13/docker-compose.yml +++ b/apps/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/apps/slink/1.2.1/docker-compose.yml b/apps/slink/1.2.1/docker-compose.yml index 3f8ba91a..da748bc9 100644 --- a/apps/slink/1.2.1/docker-compose.yml +++ b/apps/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/apps/slink/1.2.1/scripts/init.sh b/apps/slink/1.2.1/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/slink/1.2.1/scripts/init.sh +++ b/apps/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/apps/slink/1.2.1/scripts/upgrade.sh b/apps/slink/1.2.1/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/slink/1.2.1/scripts/upgrade.sh +++ b/apps/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/apps/sonarr/4.0.11/docker-compose.yml b/apps/sonarr/4.0.11/docker-compose.yml index a0de39c7..da145d2c 100644 --- a/apps/sonarr/4.0.11/docker-compose.yml +++ b/apps/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/apps/sonarr/4.0.11/scripts/init.sh b/apps/sonarr/4.0.11/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/sonarr/4.0.11/scripts/init.sh +++ b/apps/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/apps/sonarr/4.0.11/scripts/upgrade.sh b/apps/sonarr/4.0.11/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/sonarr/4.0.11/scripts/upgrade.sh +++ b/apps/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/apps/speedtest/5.4.1/docker-compose.yml b/apps/speedtest/5.4.1/docker-compose.yml index c562e975..6dbf5762 100644 --- a/apps/speedtest/5.4.1/docker-compose.yml +++ b/apps/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/apps/speedtest/5.4.1/scripts/init.sh b/apps/speedtest/5.4.1/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/speedtest/5.4.1/scripts/init.sh +++ b/apps/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/apps/speedtest/5.4.1/scripts/upgrade.sh b/apps/speedtest/5.4.1/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/speedtest/5.4.1/scripts/upgrade.sh +++ b/apps/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/apps/stream-rec-backend/0.7.2/docker-compose.yml b/apps/stream-rec-backend/0.7.2/docker-compose.yml index eb39283c..71e52df9 100644 --- a/apps/stream-rec-backend/0.7.2/docker-compose.yml +++ b/apps/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/apps/stream-rec-backend/0.7.2/scripts/init.sh b/apps/stream-rec-backend/0.7.2/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/stream-rec-backend/0.7.2/scripts/init.sh +++ b/apps/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/apps/stream-rec-backend/0.7.2/scripts/upgrade.sh b/apps/stream-rec-backend/0.7.2/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/stream-rec-backend/0.7.2/scripts/upgrade.sh +++ b/apps/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/apps/stream-rec-frontend/0.7.2/docker-compose.yml b/apps/stream-rec-frontend/0.7.2/docker-compose.yml index 8641974a..1d695a01 100644 --- a/apps/stream-rec-frontend/0.7.2/docker-compose.yml +++ b/apps/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/apps/stream-rec-frontend/0.7.2/scripts/init.sh b/apps/stream-rec-frontend/0.7.2/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/stream-rec-frontend/0.7.2/scripts/init.sh +++ b/apps/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/apps/stream-rec-frontend/0.7.2/scripts/upgrade.sh b/apps/stream-rec-frontend/0.7.2/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/stream-rec-frontend/0.7.2/scripts/upgrade.sh +++ b/apps/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/apps/stream-rec/0.7.2/docker-compose.yml b/apps/stream-rec/0.7.2/docker-compose.yml index 29a492fa..8648c2a9 100644 --- a/apps/stream-rec/0.7.2/docker-compose.yml +++ b/apps/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/apps/stream-rec/0.7.2/scripts/init.sh b/apps/stream-rec/0.7.2/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/stream-rec/0.7.2/scripts/init.sh +++ b/apps/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/apps/stream-rec/0.7.2/scripts/upgrade.sh b/apps/stream-rec/0.7.2/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/stream-rec/0.7.2/scripts/upgrade.sh +++ b/apps/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/apps/sun-panel/1.6.0/docker-compose.yml b/apps/sun-panel/1.6.0/docker-compose.yml index ddd37273..01637ede 100644 --- a/apps/sun-panel/1.6.0/docker-compose.yml +++ b/apps/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/apps/sun-panel/1.6.0/scripts/init.sh b/apps/sun-panel/1.6.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/sun-panel/1.6.0/scripts/init.sh +++ b/apps/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/apps/sun-panel/1.6.0/scripts/upgrade.sh b/apps/sun-panel/1.6.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/sun-panel/1.6.0/scripts/upgrade.sh +++ b/apps/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/apps/synapse-admin/0.10.3/docker-compose.yml b/apps/synapse-admin/0.10.3/docker-compose.yml index 4b1e8d83..c02c0b35 100644 --- a/apps/synapse-admin/0.10.3/docker-compose.yml +++ b/apps/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/apps/synapse-admin/0.10.3/scripts/init.sh b/apps/synapse-admin/0.10.3/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/synapse-admin/0.10.3/scripts/init.sh +++ b/apps/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/apps/synapse-admin/0.10.3/scripts/upgrade.sh b/apps/synapse-admin/0.10.3/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/synapse-admin/0.10.3/scripts/upgrade.sh +++ b/apps/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/apps/synapse/1.120.0/docker-compose.yml b/apps/synapse/1.120.0/docker-compose.yml index efc1faa2..8fff5a33 100644 --- a/apps/synapse/1.120.0/docker-compose.yml +++ b/apps/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/apps/synapse/1.120.0/scripts/init.sh b/apps/synapse/1.120.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/synapse/1.120.0/scripts/init.sh +++ b/apps/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/apps/synapse/1.120.0/scripts/upgrade.sh b/apps/synapse/1.120.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/synapse/1.120.0/scripts/upgrade.sh +++ b/apps/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/apps/tangsengdaodao/1.5/docker-compose.yml b/apps/tangsengdaodao/1.5/docker-compose.yml index 0c119c74..011c1801 100644 --- a/apps/tangsengdaodao/1.5/docker-compose.yml +++ b/apps/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/apps/tangsengdaodao/1.5/scripts/init.sh b/apps/tangsengdaodao/1.5/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/tangsengdaodao/1.5/scripts/init.sh +++ b/apps/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/apps/tangsengdaodao/1.5/scripts/upgrade.sh b/apps/tangsengdaodao/1.5/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/tangsengdaodao/1.5/scripts/upgrade.sh +++ b/apps/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/apps/teemii/0.8.2/docker-compose.yml b/apps/teemii/0.8.2/docker-compose.yml index 1cbddee8..1fe8c51e 100644 --- a/apps/teemii/0.8.2/docker-compose.yml +++ b/apps/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/apps/teemii/0.8.2/scripts/init.sh b/apps/teemii/0.8.2/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/teemii/0.8.2/scripts/init.sh +++ b/apps/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/apps/teemii/0.8.2/scripts/upgrade.sh b/apps/teemii/0.8.2/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/teemii/0.8.2/scripts/upgrade.sh +++ b/apps/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/apps/telegram-bot-api/8.0/docker-compose.yml b/apps/telegram-bot-api/8.0/docker-compose.yml index 9a80ed91..8499c31f 100644 --- a/apps/telegram-bot-api/8.0/docker-compose.yml +++ b/apps/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/apps/telegram-bot-api/8.0/scripts/init.sh b/apps/telegram-bot-api/8.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/telegram-bot-api/8.0/scripts/init.sh +++ b/apps/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/apps/telegram-bot-api/8.0/scripts/upgrade.sh b/apps/telegram-bot-api/8.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/telegram-bot-api/8.0/scripts/upgrade.sh +++ b/apps/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/apps/traccar/6.5/docker-compose.yml b/apps/traccar/6.5/docker-compose.yml index 552ee102..a5ffdd8e 100644 --- a/apps/traccar/6.5/docker-compose.yml +++ b/apps/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/apps/traccar/6.5/scripts/init.sh b/apps/traccar/6.5/scripts/init.sh index bbb4e079..7f45cbee 100644 --- a/apps/traccar/6.5/scripts/init.sh +++ b/apps/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/apps/traccar/6.5/scripts/upgrade.sh b/apps/traccar/6.5/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/traccar/6.5/scripts/upgrade.sh +++ b/apps/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/apps/transmission/4.0.6/docker-compose.yml b/apps/transmission/4.0.6/docker-compose.yml index 7278403a..dbe20aae 100644 --- a/apps/transmission/4.0.6/docker-compose.yml +++ b/apps/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/apps/transmission/4.0.6/scripts/init.sh b/apps/transmission/4.0.6/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/transmission/4.0.6/scripts/init.sh +++ b/apps/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/apps/transmission/4.0.6/scripts/upgrade.sh b/apps/transmission/4.0.6/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/transmission/4.0.6/scripts/upgrade.sh +++ b/apps/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/apps/umami-mysql/2.14.0/docker-compose.yml b/apps/umami-mysql/2.14.0/docker-compose.yml index 79466afe..c6c469c9 100644 --- a/apps/umami-mysql/2.14.0/docker-compose.yml +++ b/apps/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/apps/umami-mysql/2.14.0/scripts/init.sh b/apps/umami-mysql/2.14.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/umami-mysql/2.14.0/scripts/init.sh +++ b/apps/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/apps/umami-mysql/2.14.0/scripts/upgrade.sh b/apps/umami-mysql/2.14.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/umami-mysql/2.14.0/scripts/upgrade.sh +++ b/apps/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/apps/umami/2.14.0/docker-compose.yml b/apps/umami/2.14.0/docker-compose.yml index b38c9d80..bfcc4cb0 100644 --- a/apps/umami/2.14.0/docker-compose.yml +++ b/apps/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/apps/umami/2.14.0/scripts/init.sh b/apps/umami/2.14.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/umami/2.14.0/scripts/init.sh +++ b/apps/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/apps/umami/2.14.0/scripts/upgrade.sh b/apps/umami/2.14.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/umami/2.14.0/scripts/upgrade.sh +++ b/apps/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/apps/uptime-kuma/1.23.15/docker-compose.yml b/apps/uptime-kuma/1.23.15/docker-compose.yml index fb9345b3..bf7f1534 100644 --- a/apps/uptime-kuma/1.23.15/docker-compose.yml +++ b/apps/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/apps/uptime-kuma/1.23.15/scripts/init.sh b/apps/uptime-kuma/1.23.15/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/uptime-kuma/1.23.15/scripts/init.sh +++ b/apps/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/apps/uptime-kuma/1.23.15/scripts/upgrade.sh b/apps/uptime-kuma/1.23.15/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/uptime-kuma/1.23.15/scripts/upgrade.sh +++ b/apps/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/apps/uptime-kuma/2.0.0/docker-compose.yml b/apps/uptime-kuma/2.0.0/docker-compose.yml index 09a1ef24..79d81536 100644 --- a/apps/uptime-kuma/2.0.0/docker-compose.yml +++ b/apps/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/apps/uptime-kuma/2.0.0/scripts/init.sh b/apps/uptime-kuma/2.0.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/uptime-kuma/2.0.0/scripts/init.sh +++ b/apps/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/apps/uptime-kuma/2.0.0/scripts/upgrade.sh b/apps/uptime-kuma/2.0.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/uptime-kuma/2.0.0/scripts/upgrade.sh +++ b/apps/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/apps/watchyourlan/2.0.4/docker-compose.yml b/apps/watchyourlan/2.0.4/docker-compose.yml index e477e30a..aaf0dfe4 100644 --- a/apps/watchyourlan/2.0.4/docker-compose.yml +++ b/apps/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/apps/watchyourlan/2.0.4/scripts/init.sh b/apps/watchyourlan/2.0.4/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/watchyourlan/2.0.4/scripts/init.sh +++ b/apps/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/apps/watchyourlan/2.0.4/scripts/upgrade.sh b/apps/watchyourlan/2.0.4/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/watchyourlan/2.0.4/scripts/upgrade.sh +++ b/apps/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/apps/windows/4.05/docker-compose.yml b/apps/windows/4.05/docker-compose.yml index 2cb693ef..d253f0cc 100644 --- a/apps/windows/4.05/docker-compose.yml +++ b/apps/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/apps/windows/4.05/scripts/init.sh b/apps/windows/4.05/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/windows/4.05/scripts/init.sh +++ b/apps/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/apps/windows/4.05/scripts/upgrade.sh b/apps/windows/4.05/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/windows/4.05/scripts/upgrade.sh +++ b/apps/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/apps/wiseflow/0.3.0/docker-compose.yml b/apps/wiseflow/0.3.0/docker-compose.yml index 57bb2435..4759d67a 100644 --- a/apps/wiseflow/0.3.0/docker-compose.yml +++ b/apps/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/apps/wiseflow/0.3.0/scripts/init.sh b/apps/wiseflow/0.3.0/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/wiseflow/0.3.0/scripts/init.sh +++ b/apps/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/apps/wiseflow/0.3.0/scripts/upgrade.sh b/apps/wiseflow/0.3.0/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/wiseflow/0.3.0/scripts/upgrade.sh +++ b/apps/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/apps/wukongim/1.2.6/docker-compose.yml b/apps/wukongim/1.2.6/docker-compose.yml index f4f11121..5c98da8e 100644 --- a/apps/wukongim/1.2.6/docker-compose.yml +++ b/apps/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/apps/wukongim/1.2.6/scripts/init.sh b/apps/wukongim/1.2.6/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/wukongim/1.2.6/scripts/init.sh +++ b/apps/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/apps/wukongim/1.2.6/scripts/upgrade.sh b/apps/wukongim/1.2.6/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/wukongim/1.2.6/scripts/upgrade.sh +++ b/apps/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/apps/xunlei-cnk3x/3.20.2/docker-compose.yml b/apps/xunlei-cnk3x/3.20.2/docker-compose.yml index 2dc624cc..b13a2aa4 100644 --- a/apps/xunlei-cnk3x/3.20.2/docker-compose.yml +++ b/apps/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/apps/xunlei-cnk3x/3.20.2/scripts/init.sh b/apps/xunlei-cnk3x/3.20.2/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/xunlei-cnk3x/3.20.2/scripts/init.sh +++ b/apps/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/apps/xunlei-cnk3x/3.20.2/scripts/upgrade.sh b/apps/xunlei-cnk3x/3.20.2/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/xunlei-cnk3x/3.20.2/scripts/upgrade.sh +++ b/apps/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/apps/zerotier-planet/1.14.2/docker-compose.yml b/apps/zerotier-planet/1.14.2/docker-compose.yml index 993bc234..3e851d6c 100644 --- a/apps/zerotier-planet/1.14.2/docker-compose.yml +++ b/apps/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/apps/zerotier-planet/1.14.2/scripts/init.sh b/apps/zerotier-planet/1.14.2/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/zerotier-planet/1.14.2/scripts/init.sh +++ b/apps/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/apps/zerotier-planet/1.14.2/scripts/upgrade.sh b/apps/zerotier-planet/1.14.2/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/zerotier-planet/1.14.2/scripts/upgrade.sh +++ b/apps/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/apps/ztncui/1.2.17/docker-compose.yml b/apps/ztncui/1.2.17/docker-compose.yml index f4e30b05..e0772d4e 100644 --- a/apps/ztncui/1.2.17/docker-compose.yml +++ b/apps/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/apps/ztncui/1.2.17/scripts/init.sh b/apps/ztncui/1.2.17/scripts/init.sh index 77b84912..07fb8c3f 100644 --- a/apps/ztncui/1.2.17/scripts/init.sh +++ b/apps/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/apps/ztncui/1.2.17/scripts/upgrade.sh b/apps/ztncui/1.2.17/scripts/upgrade.sh index 77b84912..07fb8c3f 100644 --- a/apps/ztncui/1.2.17/scripts/upgrade.sh +++ b/apps/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."