From 6b8d4a78a6e41dd81a3471f8bdade77f6f3d6411 Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Tue, 24 Mar 2026 16:40:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=E4=BD=BF=E7=94=A8docker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rc-auth/pipeline-dev | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/rc-auth/pipeline-dev b/rc-auth/pipeline-dev
index 211cd8fc..b5b4634f 100644
--- a/rc-auth/pipeline-dev
+++ b/rc-auth/pipeline-dev
@@ -9,7 +9,7 @@ pipeline {
     }
 
     environment {
-        PATH = "/var/jenkins_home/nerdctl/bin:/var/jenkins_home/jdk-17/bin:${env.PATH}"
+        PATH = "/var/jenkins_home/jdk-17/bin:${env.PATH}"
         BUILD_IMAGE = "${sh(script:'echo -n azizi-dev:auth-$(date +%Y%m%dv%H%M%S)', returnStdout: true)}"
         JAR_FILE = ""
         JAR_SIZE = ""
@@ -17,8 +17,6 @@ pipeline {
         JAR_NAME = "rc-auth-*.jar"
         ALIYUN_REGISTRY = "registry.cn-hangzhou.aliyuncs.com/public_mirror_images"
         IMAGE_REP_TAG = ""
-        NERDCTL = "nerdctl --address /run/containerd/containerd.sock --namespace k8s.io"
-        XDG_RUNTIME_DIR = "/tmp/runtime-jenkins"
         DOCKER_FILE = "rc-auth/Dockerfile-dev"
         DOCKER_DIR = "rc-auth"
         K8S_NAMESPACE = "azizi"
@@ -29,19 +27,18 @@ pipeline {
     stages {
         stage('Build') {
             steps {
-                sh 'mkdir -p /tmp/runtime-jenkins && chmod 700 /tmp/runtime-jenkins'
                 configFileProvider([configFile(fileId: '0fcb2100-aec1-45ef-b3ea-64f2f911d462', variable: 'MAVEN_SETTINGS')]) {
-                sh 'mvn clean package -pl rc-auth -am -P dev -Dmaven.test.skip=true -s $MAVEN_SETTINGS'
-                sh 'ls ${JAR_TARGET_DIR}'
-                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}:auth-${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}"
+                    sh 'mvn clean package -pl rc-auth -am -P dev -Dmaven.test.skip=true -s $MAVEN_SETTINGS'
+                    sh 'ls ${JAR_TARGET_DIR}'
+                    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}:auth-${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}"
                 }
             }
         }
@@ -52,15 +49,15 @@ pipeline {
                     usernameVariable: 'ALIYUN_USER',
                     passwordVariable: 'ALIYUN_PASS'
                 )]) {
-                    sh 'echo $ALIYUN_PASS | $NERDCTL login --username $ALIYUN_USER --password-stdin registry.cn-hangzhou.aliyuncs.com'
+                    sh 'echo $ALIYUN_PASS | docker login --username $ALIYUN_USER --password-stdin registry.cn-hangzhou.aliyuncs.com'
                 }
-                sh "${NERDCTL} build --build-arg SERVICE_VERSION=${BUILD_IMAGE} -f ${DOCKER_FILE} -t ${IMAGE_REP_TAG} ${DOCKER_DIR}"
+                sh "docker build --build-arg SERVICE_VERSION=${BUILD_IMAGE} -f ${DOCKER_FILE} -t ${IMAGE_REP_TAG} ${DOCKER_DIR}"
             }
         }
         stage('Upload image') {
             steps {
-                sh "${NERDCTL} push ${IMAGE_REP_TAG}"
-                sh "${NERDCTL} rmi -f ${IMAGE_REP_TAG}"
+                sh "docker push ${IMAGE_REP_TAG}"
+                sh "docker rmi -f ${IMAGE_REP_TAG}"
             }
         }
         stage('Apply') {