From 52f9540d825804900b7e84e482a2074dfd9f0909 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: 萌森 --- .github/README.md | 2 +- README.md | 2 +- apps/speedtest/5.3.3/docker-compose.yml | 5 +++-- apps/speedtest/5.3.3/scripts/init.sh | 5 +++++ apps/speedtest/5.3.3/scripts/upgrade.sh | 5 +++++ 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/README.md b/.github/README.md index 3270e7b5..63e499e2 100644 --- a/.github/README.md +++ b/.github/README.md @@ -120,7 +120,7 @@ | 🟢 | | Redis | https://redis.io/ | 从世界上最快的内存数据库创建者那里获取该数据库 | | | 🟢 | | Sentinel | https://sentinelguard.io/ | 面向分布式、多语言异构化服务架构的流量治理组件 | | | 🟢 | | SiYuan | https://b3log.org/siyuan/ | 【思源笔记】一款隐私优先、自托管、完全开源的个人知识管理软件 | | -| 🔴 | | SpeedTest | https://www.speedtest.net/ | 互联网速度测试 | SpeedTest | +| 🟢 | | SpeedTest | https://www.speedtest.net/ | 互联网速度测试 | SpeedTest | | 🔴 | | SpeedTest-Tracker | https://docs.speedtest-tracker.dev/ | Speedtest Tracker 是一款自托管互联网性能跟踪应用程序，可针对 Ookla 的 Speedtest 服务运行速度测试检查 | | | 🟢 | | Stream-Rec | https://github.com/hua0512/stream-rec/ | Stream-rec是一个用于各种流媒体服务的自动流媒体录制工具 | | | 🟢 | | Telegram Bot Api | https://telegram.org/ | 自建 Telegram Bot API 服务器 | | diff --git a/README.md b/README.md index 89aaef04..4e401d2e 100644 --- a/README.md +++ b/README.md @@ -103,7 +103,7 @@ | 🟢 | | Redis | https://redis.io/ | 从世界上最快的内存数据库创建者那里获取该数据库 | | | 🟢 | | Sentinel | https://sentinelguard.io/ | 面向分布式、多语言异构化服务架构的流量治理组件 | | | 🟢 | | SiYuan | https://b3log.org/siyuan/ | 【思源笔记】一款隐私优先、自托管、完全开源的个人知识管理软件 | | -| 🔴 | | SpeedTest | https://www.speedtest.net/ | 互联网速度测试 | SpeedTest | +| 🟢 | | SpeedTest | https://www.speedtest.net/ | 互联网速度测试 | SpeedTest | | 🔴 | | SpeedTest-Tracker | https://docs.speedtest-tracker.dev/ | Speedtest Tracker 是一款自托管互联网性能跟踪应用程序，可针对 Ookla 的 Speedtest 服务运行速度测试检查 | | | 🟢 | | Stream-Rec | https://github.com/hua0512/stream-rec/ | Stream-rec是一个用于各种流媒体服务的自动流媒体录制工具 | | | 🟢 | | Telegram Bot Api | https://telegram.org/ | 自建 Telegram Bot API 服务器 | | diff --git a/apps/speedtest/5.3.3/docker-compose.yml b/apps/speedtest/5.3.3/docker-compose.yml index c24b5b54..76456af9 100644 --- a/apps/speedtest/5.3.3/docker-compose.yml +++ b/apps/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/apps/speedtest/5.3.3/scripts/init.sh b/apps/speedtest/5.3.3/scripts/init.sh index c86c4fbc..77b84912 100644 --- a/apps/speedtest/5.3.3/scripts/init.sh +++ b/apps/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/apps/speedtest/5.3.3/scripts/upgrade.sh b/apps/speedtest/5.3.3/scripts/upgrade.sh index c86c4fbc..77b84912 100644 --- a/apps/speedtest/5.3.3/scripts/upgrade.sh +++ b/apps/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