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',