Pārlūkot izejas kodu

feat: add the huawei image repo

yrluke 1 gadu atpakaļ
vecāks
revīzija
045ec5f44e
3 mainītis faili ar 22 papildinājumiem un 15 dzēšanām
  1. 5 5
      release/latest/compose.yaml
  2. 8 5
      release/latest/setup.sh
  3. 9 5
      release/latest/upgrade.sh

+ 5 - 5
release/latest/compose.yaml

@@ -30,7 +30,7 @@ services:
   management:
   management:
     container_name: safeline-mgt-api
     container_name: safeline-mgt-api
     restart: always
     restart: always
-    image: chaitin/safeline-mgt-api:${IMAGE_TAG:?image tag required}
+    image: ${IMAGE_PREFIX}/safeline-mgt-api:${IMAGE_TAG:?image tag required}
     volumes:
     volumes:
       - ${SAFELINE_DIR?safeline dir required}/resources/management:/resources/management
       - ${SAFELINE_DIR?safeline dir required}/resources/management:/resources/management
       - ${SAFELINE_DIR}/resources/nginx:/resources/nginx
       - ${SAFELINE_DIR}/resources/nginx:/resources/nginx
@@ -60,7 +60,7 @@ services:
   detector:
   detector:
     container_name: safeline-detector
     container_name: safeline-detector
     restart: always
     restart: always
-    image: chaitin/safeline-detector:${IMAGE_TAG}
+    image: ${IMAGE_PREFIX}/safeline-detector:${IMAGE_TAG}
     volumes:
     volumes:
       - ${SAFELINE_DIR}/resources/detector:/resources/detector
       - ${SAFELINE_DIR}/resources/detector:/resources/detector
       - ${SAFELINE_DIR}/logs/detector:/logs/detector
       - ${SAFELINE_DIR}/logs/detector:/logs/detector
@@ -75,7 +75,7 @@ services:
   mario:
   mario:
     container_name: safeline-mario
     container_name: safeline-mario
     restart: always
     restart: always
-    image: chaitin/safeline-mario:${IMAGE_TAG}
+    image: ${IMAGE_PREFIX}/safeline-mario:${IMAGE_TAG}
     volumes:
     volumes:
       - ${SAFELINE_DIR}/resources/mario:/resources/mario
       - ${SAFELINE_DIR}/resources/mario:/resources/mario
       - ${SAFELINE_DIR}/logs/mario:/logs/mario
       - ${SAFELINE_DIR}/logs/mario:/logs/mario
@@ -92,7 +92,7 @@ services:
   tengine:
   tengine:
     container_name: safeline-tengine
     container_name: safeline-tengine
     restart: always
     restart: always
-    image: chaitin/safeline-tengine:${IMAGE_TAG}
+    image: ${IMAGE_PREFIX}/safeline-tengine:${IMAGE_TAG}
     volumes:
     volumes:
       - ${SAFELINE_DIR}/resources/nginx:/etc/nginx
       - ${SAFELINE_DIR}/resources/nginx:/etc/nginx
       - ${SAFELINE_DIR}/resources/management:/resources/management
       - ${SAFELINE_DIR}/resources/management:/resources/management
@@ -109,7 +109,7 @@ services:
   fvm-manager:
   fvm-manager:
     container_name: safeline-fvm-manager
     container_name: safeline-fvm-manager
     restart: always
     restart: always
-    image: chaitin/safeline-fvm-manager:${IMAGE_TAG}
+    image: ${IMAGE_PREFIX}/safeline-fvm-manager:${IMAGE_TAG}
     environment:
     environment:
       - FVM_LOGS_DIR=/logs/management
       - FVM_LOGS_DIR=/logs/management
       - DETECTOR_URL=http://safeline-detector:8001
       - DETECTOR_URL=http://safeline-detector:8001

+ 8 - 5
release/latest/setup.sh

@@ -9,6 +9,7 @@ echo "
 "
 "
 
 
 export STREAM=${STREAM:-0}
 export STREAM=${STREAM:-0}
+export CDN=${CDN:-0}
 
 
 qrcode() {
 qrcode() {
     echo "█████████████████████████████████████████"
     echo "█████████████████████████████████████████"
@@ -191,11 +192,7 @@ fi
 info "创建安装目录 '$safeline_path' 成功"
 info "创建安装目录 '$safeline_path' 成功"
 cd "$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
 if [ $? -ne "0" ]; then
     abort "下载 compose.yaml 脚本失败"
     abort "下载 compose.yaml 脚本失败"
@@ -220,6 +217,12 @@ echo "MGT_PORT=9443" >> .env
 echo "POSTGRES_PASSWORD=$(LC_ALL=C tr -dc A-Za-z0-9 </dev/urandom | head -c 32)" >> .env
 echo "POSTGRES_PASSWORD=$(LC_ALL=C tr -dc A-Za-z0-9 </dev/urandom | head -c 32)" >> .env
 echo "SUBNET_PREFIX=172.22.222" >> .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 镜像"
 info "即将开始下载 Docker 镜像"
 
 
 $compose_command up -d
 $compose_command up -d

+ 9 - 5
release/latest/upgrade.sh

@@ -9,6 +9,7 @@ echo "
 "
 "
 
 
 export STREAM=${STREAM:-0}
 export STREAM=${STREAM:-0}
+export CDN=${CDN:-0}
 
 
 echo $1
 echo $1
 
 
@@ -194,11 +195,7 @@ fi
 
 
 mv $compose_name $compose_name.old
 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
 if [ $? -ne "0" ]; then
     abort "下载 compose.yaml 脚本失败"
     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 </dev/urandom | head -c 32)" >>".env"
 grep "POSTGRES_PASSWORD" ".env" >/dev/null || echo "POSTGRES_PASSWORD=$(LC_ALL=C tr -dc A-Za-z0-9 </dev/urandom | head -c 32)" >>".env"
 grep "SUBNET_PREFIX" ".env" >/dev/null || echo "SUBNET_PREFIX=172.22.222" >>".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 "升级 .env 脚本成功"
 
 
 info "即将开始下载新版本 Docker 镜像"
 info "即将开始下载新版本 Docker 镜像"