From 992488972a6a9b92628557dc3c9f034e71e8cd1a Mon Sep 17 00:00:00 2001 From: "xiaobing.wang" Date: Tue, 18 Jun 2024 19:06:24 +0800 Subject: [PATCH] fix: docker image --- release/latest/setup.sh | 8 ++++---- release/latest/upgrade.sh | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/release/latest/setup.sh b/release/latest/setup.sh index a361b91..db8576b 100755 --- a/release/latest/setup.sh +++ b/release/latest/setup.sh @@ -9,7 +9,6 @@ echo " " export STREAM=${STREAM:-0} -export CDN=${CDN:-1} qrcode() { echo "█████████████████████████████████████████" @@ -314,10 +313,11 @@ echo "POSTGRES_PASSWORD=$(LC_ALL=C tr -dc A-Za-z0-9 > .env if [ -z "$CDN" ]; then - if [[ $(curl -s ipinfo.io/country) == "CN" ]]; then - CDN=1 - else + if ping -c 1 -W 1 docker.com > /dev/null 2>&1; then CDN=0 + else + CDN=1 + echo "检测到你的网络环境不支持直接访问 Docker Hub, 镜像将从华为云镜像仓库下载" fi fi diff --git a/release/latest/upgrade.sh b/release/latest/upgrade.sh index dc8e9ee..14158f3 100755 --- a/release/latest/upgrade.sh +++ b/release/latest/upgrade.sh @@ -300,10 +300,11 @@ grep "POSTGRES_PASSWORD" ".env" >/dev/null || echo "POSTGRES_PASSWORD=$(LC_ALL=C grep "SUBNET_PREFIX" ".env" >/dev/null || echo "SUBNET_PREFIX=172.22.222" >>".env" if [ -z "$CDN" ]; then - if [[ $(curl -s ipinfo.io/country) == "CN" ]]; then - CDN=1 - else + if ping -c 1 -W 1 docker.com > /dev/null 2>&1; then CDN=0 + else + CDN=1 + echo "检测到你的网络环境不支持直接访问 Docker Hub, 镜像将从华为云镜像仓库下载" fi fi