diff --git a/release/beta/compose.yaml b/release/beta/compose.yaml index 526e024..7df2244 100644 --- a/release/beta/compose.yaml +++ b/release/beta/compose.yaml @@ -82,13 +82,12 @@ services: restart: always image: chaitin/safeline-tengine:${IMAGE_TAG} volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/resolv.conf:/etc/resolv.conf - ${SAFELINE_DIR}/resources/nginx:/etc/nginx - - ${SAFELINE_DIR}/resources/management:/resources/management - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx - - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache - - /etc/resolv.conf:/etc/resolv.conf environment: - TCD_MGT_API=https://${SUBNET_PREFIX}.4:1443/api/open/publish/server - SNSERVER_ADDR=${SUBNET_PREFIX}.5:8000 diff --git a/release/beta/upgrade.sh b/release/beta/upgrade.sh index 3da744b..ef2c765 100755 --- a/release/beta/upgrade.sh +++ b/release/beta/upgrade.sh @@ -220,10 +220,12 @@ info "即将开始替换 Docker 容器" # 升级到 3.14.0 版本时,移除了 safeline-redis 容器,需要删除容器,否则无法启动新 compose 网络 docker rm -f safeline-redis &>/dev/null +# 升级到 4.0.0 ,重命名了 mgt、fvm、pg 几个容器 docker rm -f safeline-mgt-api &>/dev/null docker rm -f safeline-fvm-manager &>/dev/null +docker rm -f safeline-postgres &>/dev/null -$compose_command down && $compose_command up -d +$compose_command down --remove-orphans && $compose_command up -d if [ $? -ne "0" ]; then abort "替换 Docker 容器失败" fi