From fbdd34b0612454b9bf1b7092fc70f97e5ce0e8f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E6=A3=AE?= Date: Mon, 5 Aug 2024 10:13:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BA=94=E7=94=A8=20SpeedTes?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 萌森 --- speedtest/5.3.3/docker-compose.yml | 5 +++-- speedtest/5.3.3/scripts/init.sh | 5 +++++ speedtest/5.3.3/scripts/upgrade.sh | 5 +++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/speedtest/5.3.3/docker-compose.yml b/speedtest/5.3.3/docker-compose.yml index c24b5b547..76456af92 100644 --- a/speedtest/5.3.3/docker-compose.yml +++ b/speedtest/5.3.3/docker-compose.yml @@ -15,10 +15,11 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:80 + env_file: + - /etc/1panel/envs/global.env + - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${SPEED_TEST_ROOT_PATH}/database:/database environment: - MODE=standalone - WEBPORT=80 - env_file: - - .env diff --git a/speedtest/5.3.3/scripts/init.sh b/speedtest/5.3.3/scripts/init.sh index c86c4fbca..77b849120 100644 --- a/speedtest/5.3.3/scripts/init.sh +++ b/speedtest/5.3.3/scripts/init.sh @@ -3,6 +3,11 @@ if [ -f .env ]; then source .env + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "Check Finish." else diff --git a/speedtest/5.3.3/scripts/upgrade.sh b/speedtest/5.3.3/scripts/upgrade.sh index c86c4fbca..77b849120 100644 --- a/speedtest/5.3.3/scripts/upgrade.sh +++ b/speedtest/5.3.3/scripts/upgrade.sh @@ -3,6 +3,11 @@ if [ -f .env ]; then source .env + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "Check Finish." else