From 430018304be147630c891a7587530e58e1c812a1 Mon Sep 17 00:00:00 2001 From: lzh Date: Tue, 13 Jan 2026 17:24:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E5=81=A5=E5=BA=B7?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=9A=84=E5=AE=B9=E5=99=A8=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加 getContainerName 函数 - 将服务名正确映射到容器名 - 例如:viewsh-gateway -> aiot-gateway --- Jenkinsfile | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0fe41160..1b03aa3d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -256,10 +256,11 @@ def deployService(String service) { """ // 健康检查 + def containerName = getContainerName(service) sh """ ssh ${sshOpts} root@${DEPLOY_HOST} ' for i in 1 2 3 4 5 6 7 8 9 10 11 12; do - STATUS=\$(docker inspect --format="{{.State.Health.Status}}" aiot-${service} 2>/dev/null || echo "starting") + STATUS=\$(docker inspect --format="{{.State.Health.Status}}" ${containerName} 2>/dev/null || echo "starting") [ "\$STATUS" = "healthy" ] && echo "${service} is healthy" && exit 0 sleep 10 done @@ -270,6 +271,18 @@ def deployService(String service) { echo "✅ ${service} deployed" } +def getContainerName(String service) { + // 服务名到容器名的映射 + def map = [ + 'viewsh-gateway': 'aiot-gateway', + 'viewsh-module-system-server': 'aiot-system-server', + 'viewsh-module-infra-server': 'aiot-infra-server', + 'viewsh-module-iot-server': 'aiot-iot-server', + 'viewsh-module-iot-gateway': 'aiot-iot-gateway' + ] + return map[service] ?: "aiot-${service}" +} + def getModulePath(String service) { def map = [ 'viewsh-gateway': 'viewsh-gateway',