From 045ec5f44effa13c98d0673cf7cbfb3e44e19c95 Mon Sep 17 00:00:00 2001 From: yrluke <42405631+yrluke@users.noreply.github.com> Date: Fri, 5 Jan 2024 18:56:38 +0800 Subject: [PATCH] feat: add the huawei image repo --- release/latest/compose.yaml | 10 +++++----- release/latest/setup.sh | 13 ++++++++----- release/latest/upgrade.sh | 14 +++++++++----- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/release/latest/compose.yaml b/release/latest/compose.yaml index e62a552..395adba 100644 --- a/release/latest/compose.yaml +++ b/release/latest/compose.yaml @@ -30,7 +30,7 @@ services: management: container_name: safeline-mgt-api restart: always - image: chaitin/safeline-mgt-api:${IMAGE_TAG:?image tag required} + image: ${IMAGE_PREFIX}/safeline-mgt-api:${IMAGE_TAG:?image tag required} volumes: - ${SAFELINE_DIR?safeline dir required}/resources/management:/resources/management - ${SAFELINE_DIR}/resources/nginx:/resources/nginx @@ -60,7 +60,7 @@ services: detector: container_name: safeline-detector restart: always - image: chaitin/safeline-detector:${IMAGE_TAG} + image: ${IMAGE_PREFIX}/safeline-detector:${IMAGE_TAG} volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -75,7 +75,7 @@ services: mario: container_name: safeline-mario restart: always - image: chaitin/safeline-mario:${IMAGE_TAG} + image: ${IMAGE_PREFIX}/safeline-mario:${IMAGE_TAG} volumes: - ${SAFELINE_DIR}/resources/mario:/resources/mario - ${SAFELINE_DIR}/logs/mario:/logs/mario @@ -92,7 +92,7 @@ services: tengine: container_name: safeline-tengine restart: always - image: chaitin/safeline-tengine:${IMAGE_TAG} + image: ${IMAGE_PREFIX}/safeline-tengine:${IMAGE_TAG} volumes: - ${SAFELINE_DIR}/resources/nginx:/etc/nginx - ${SAFELINE_DIR}/resources/management:/resources/management @@ -109,7 +109,7 @@ services: fvm-manager: container_name: safeline-fvm-manager restart: always - image: chaitin/safeline-fvm-manager:${IMAGE_TAG} + image: ${IMAGE_PREFIX}/safeline-fvm-manager:${IMAGE_TAG} environment: - FVM_LOGS_DIR=/logs/management - DETECTOR_URL=http://safeline-detector:8001 diff --git a/release/latest/setup.sh b/release/latest/setup.sh index c15b9fe..349e4e3 100755 --- a/release/latest/setup.sh +++ b/release/latest/setup.sh @@ -9,6 +9,7 @@ echo " " export STREAM=${STREAM:-0} +export CDN=${CDN:-0} qrcode() { echo "█████████████████████████████████████████" @@ -191,11 +192,7 @@ fi info "创建安装目录 '$safeline_path' 成功" cd "$safeline_path" -if [ $STREAM -eq 1 ]; then - curl "https://waf-ce.chaitin.cn/release/beta/compose.yaml" -sSLk -o compose.yaml -else - curl "https://waf-ce.chaitin.cn/release/latest/compose.yaml" -sSLk -o compose.yaml -fi +curl "https://waf-ce.chaitin.cn/release/latest/compose.yaml" -sSLk -o compose.yaml if [ $? -ne "0" ]; then abort "下载 compose.yaml 脚本失败" @@ -220,6 +217,12 @@ echo "MGT_PORT=9443" >> .env echo "POSTGRES_PASSWORD=$(LC_ALL=C tr -dc A-Za-z0-9 > .env echo "SUBNET_PREFIX=172.22.222" >> .env +if [ $CDN -eq 1 ]; then + echo "IMAGE_PREFIX=chaitin" >>".env" +else + echo "IMAGE_PREFIX=swr.cn-east-3.myhuaweicloud.com/chaitin-safeline" >>".env" +fi + info "即将开始下载 Docker 镜像" $compose_command up -d diff --git a/release/latest/upgrade.sh b/release/latest/upgrade.sh index 0d982e5..c3746f0 100755 --- a/release/latest/upgrade.sh +++ b/release/latest/upgrade.sh @@ -9,6 +9,7 @@ echo " " export STREAM=${STREAM:-0} +export CDN=${CDN:-0} echo $1 @@ -194,11 +195,7 @@ fi mv $compose_name $compose_name.old -if [ $STREAM -eq 1 ]; then - curl "https://waf-ce.chaitin.cn/release/beta/compose.yaml" -sSLk -o $compose_name -else - curl "https://waf-ce.chaitin.cn/release/latest/compose.yaml" -sSLk -o $compose_name -fi +curl "https://waf-ce.chaitin.cn/release/latest/compose.yaml" -sSLk -o $compose_name if [ $? -ne "0" ]; then abort "下载 compose.yaml 脚本失败" @@ -223,6 +220,13 @@ grep "MGT_PORT" ".env" >/dev/null || echo "MGT_PORT=9443" >>".env" grep "POSTGRES_PASSWORD" ".env" >/dev/null || echo "POSTGRES_PASSWORD=$(LC_ALL=C tr -dc A-Za-z0-9 >".env" grep "SUBNET_PREFIX" ".env" >/dev/null || echo "SUBNET_PREFIX=172.22.222" >>".env" + +if [ $CDN -eq 1 ]; then + grep "IMAGE_PREFIX" ".env" >/dev/null || echo "IMAGE_PREFIX=chaitin" >>".env" +else + grep "IMAGE_PREFIX" ".env" >/dev/null || echo "IMAGE_PREFIX=swr.cn-east-3.myhuaweicloud.com/chaitin-safeline" >>".env" +fi + info "升级 .env 脚本成功" info "即将开始下载新版本 Docker 镜像"