From e60ee961d878f2dc8b1b6afbd38c357a72c28fa2 Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Tue, 24 Mar 2026 20:38:22 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"console=E5=8E=BB=E9=99=A4push"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 66253bc018a8666203a57b050696c6c65a767477.
---
 rc-service/rc-service-console/pipeline-dev | 26 +++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/rc-service/rc-service-console/pipeline-dev b/rc-service/rc-service-console/pipeline-dev
index a6cc7253..726aba94 100644
--- a/rc-service/rc-service-console/pipeline-dev
+++ b/rc-service/rc-service-console/pipeline-dev
@@ -10,11 +10,13 @@ pipeline {
 
     environment {
         PATH = "/var/jenkins_home/docker-cli/bin:/var/jenkins_home/jdk-17/bin:/var/jenkins_home/kubectl/bin:${env.PATH}"
+        BUILD_IMAGE = "${sh(script:'echo -n azizi-dev:console-$(date +%Y%m%dv%H%M%S)', returnStdout: true)}"
         JAR_FILE = ""
         JAR_SIZE = ""
         JAR_TARGET_DIR = "rc-service/rc-service-console/console-start/target"
         JAR_NAME = "rc-service-console-*.jar"
-        IMAGE_TAG = "azizi-dev/console:latest"
+        ALIYUN_REGISTRY = "registry.cn-hangzhou.aliyuncs.com/azizi-dev/console"
+        IMAGE_REP_TAG = ""
         DOCKER_FILE = "rc-service/rc-service-console/Dockerfile-dev"
         DOCKER_DIR = "rc-service/rc-service-console"
         K8S_NAMESPACE = "azizi"
@@ -31,21 +33,39 @@ pipeline {
                     script {
                         JAR_FILE = "${sh(script:'ls -t ${JAR_TARGET_DIR}/${JAR_NAME} | head -n 1', returnStdout: true).trim()}"
                         JAR_SIZE = "${sh(script:'du -h ${JAR_TARGET_DIR}/${JAR_NAME}', returnStdout: true).trim()}"
+                        IMAGE_REP_TAG = "${ALIYUN_REGISTRY}:console-${sh(script:'date +%Y%m%dv%H%M%S', returnStdout: true).trim()}"
                     }
                     echo "---> Jar file: ${JAR_FILE}"
                     echo "---> Jar size: ${JAR_SIZE}"
+                    echo "---> Image name: ${BUILD_IMAGE}"
+                    echo "---> Image registry tag: ${IMAGE_REP_TAG}"
                 }
             }
         }
         stage('Build image') {
             steps {
-                sh "docker build -f ${DOCKER_FILE} -t ${IMAGE_TAG} ${DOCKER_DIR}"
+                withCredentials([usernamePassword(
+                    credentialsId: 'aliyun-registry',
+                    usernameVariable: 'ALIYUN_USER',
+                    passwordVariable: 'ALIYUN_PASS'
+                )]) {
+                    sh 'echo $ALIYUN_PASS | docker login --username $ALIYUN_USER --password-stdin registry.cn-hangzhou.aliyuncs.com'
+                }
+                sh "docker build --build-arg SERVICE_VERSION=${BUILD_IMAGE} -f ${DOCKER_FILE} -t ${IMAGE_REP_TAG} ${DOCKER_DIR}"
+            }
+        }
+        stage('Upload image') {
+            steps {
+                sh "docker push ${IMAGE_REP_TAG}"
+                sh "docker tag ${IMAGE_REP_TAG} registry.cn-hangzhou.aliyuncs.com/azizi-dev/console:latest"
+                sh "docker push registry.cn-hangzhou.aliyuncs.com/azizi-dev/console:latest"
+                sh "docker rmi -f ${IMAGE_REP_TAG} registry.cn-hangzhou.aliyuncs.com/azizi-dev/console:latest"
             }
         }
         stage('Apply') {
             steps {
                 sh "pwd && whoami"
-                sh "kubectl -n ${K8S_NAMESPACE} rollout restart deployment/${K8S_DEPLOYMENT}"
+                sh "kubectl -n ${K8S_NAMESPACE} set image deployment/${K8S_DEPLOYMENT} ${K8S_APP_LABEL}=${IMAGE_REP_TAG}"
             }
         }
     }