diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index c4ad595..9ecbdab 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -66,7 +66,7 @@ jobs: -v /opt/docker/ubs-m2:/root/.m2 \ -w /build maven:3.6.3-jdk-8 sleep 3600 docker cp "${PWD}/." mavenbuild:/build/ - docker exec mavenbuild sh -c 'cd /build/service && mvn -B -DskipTests clean package' + docker exec mavenbuild sh -c 'cd /build/service && mvn -U -B -DskipTests clean package' mkdir -p "${PWD}/service/target" docker cp mavenbuild:/build/service/target/userbase.jar "${PWD}/service/target/userbase.jar" docker rm -f mavenbuild @@ -98,7 +98,10 @@ jobs: RB=userbase-service:rb-$(date +%s) docker tag userbase-service:latest "$RB" 2>/dev/null || true docker stop userbase-service 2>/dev/null; docker rm -f userbase-service 2>/dev/null - docker run -d --name userbase-service --restart unless-stopped --network infra-infra-net -p 8060:8060 "$IMG" + docker run -d --name userbase-service --restart unless-stopped --network infra-infra-net -p 8060:8060 \ + -e NACOS_ADDR=nacos:8848 \ + -e NACOS_NAMESPACE=6196f0de-a28d-4894-8f10-e2982b57c6bc \ + "$IMG" # 健康检查:Spring 起来后 /userbase/ 返回 404(根路径无映射控制器),000 表示未起来 OK=0 for i in $(seq 1 30); do @@ -113,4 +116,5 @@ jobs: echo "rolled back"; exit 7 fi echo "DEPLOY OK: $IMG" + docker tag "$IMG" userbase-service:latest docker ps --format 'table {{.Names}}\t{{.Status}}\t{{.Image}}' | grep userbase || true