From d64af52c2e3d5eadd1de37876861c29c8aebbdb9 Mon Sep 17 00:00:00 2001
From: chenchun <chenchun@virtheart.com>
Date: Wed, 6 May 2026 17:02:49 +0800
Subject: [PATCH] =?UTF-8?q?ci(Jenkinsfile):=20=E7=A7=BB=E9=99=A4=E7=A1=AC?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E7=9A=84registry=E7=94=A8=E6=88=B7=E5=90=8D?=
 =?UTF-8?q?=E5=B9=B6=E5=A2=9E=E5=8A=A0docker=E8=B0=83=E8=AF=95=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

删除硬编码的REGISTRY_USERNAME环境变量，改为从外部传入
在docker构建和推送步骤中添加set -x和版本信息输出以便调试
增加docker构建失败时的错误处理和退出机制
---
 Jenkinsfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8b83147..b478f86 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,7 +4,6 @@ pipeline {
     environment {
         REGISTRY = 'git.virtheart.com'
         REGISTRY_OWNER = 'virtheart'
-        REGISTRY_USERNAME = 'chenchun@virtheart.com'
         IMAGE_NAME = "${env.JOB_NAME.replaceAll(/[^a-zA-Z0-9.-]/, '-').toLowerCase()}"
         IMAGE_TAG = "${env.BUILD_NUMBER}"
     }
@@ -21,7 +20,10 @@ pipeline {
                 script {
                     def imageFullName = "${REGISTRY}/${REGISTRY_OWNER}/${IMAGE_NAME}:${IMAGE_TAG}"
                     sh """
-                        docker build -t ${imageFullName} .
+                        set -x
+                        docker version
+                        docker info
+                        docker build -t ${imageFullName} . || { echo "Docker build failed"; exit 1; }
                     """
                 }
             }
@@ -33,6 +35,7 @@ pipeline {
                     script {
                         def imageFullName = "${REGISTRY}/${REGISTRY_OWNER}/${IMAGE_NAME}:${IMAGE_TAG}"
                         sh """
+                            set -x
                             echo ${REGISTRY_PASSWORD} | docker login ${REGISTRY} -u ${REGISTRY_USERNAME} --password-stdin
                             docker push ${imageFullName}
                             docker rmi ${imageFullName}