Selaa lähdekoodia

fix: 修改Jenkinsfile,适配SCM模式

天空之城 3 viikkoa sitten
vanhempi
commit
749f917b3c
1 muutettua tiedostoa jossa 8 lisäystä ja 24 poistoa
  1. 8 24
      Jenkinsfile

+ 8 - 24
Jenkinsfile

@@ -10,11 +10,7 @@ pipeline {
   }
 
   environment {
-    // UAT 代码检出目录
-    CHECKOUT_BASE = "/docker/python-uat"
-    CODE_DIR      = "/docker/python-uat"
-
-    // Dockerfile 路径
+    // Dockerfile 路径(相对于代码根目录,即 Jenkins workspace)
     DOCKERFILE_STORE    = "alien_store/Dockerfile"
     DOCKERFILE_GATEWAY  = "alien_gateway/Dockerfile"
     DOCKERFILE_CONTRACT = "alien_contract/Dockerfile"
@@ -46,17 +42,8 @@ pipeline {
   }
 
   stages {
-    stage('Checkout') {
-      steps {
-        echo ">>> UAT环境:拉取分支 ${params.BRANCH} 到 ${CHECKOUT_BASE} ..."
-        sh "mkdir -p ${CHECKOUT_BASE}"
-        dir("${CHECKOUT_BASE}") {
-          git branch: "${params.BRANCH}",
-              credentialsId: 'gogs-alien-cloud-uat',
-              url: 'http://8.152.195.41:3000/alien/alien_py_cloud'
-        }
-      }
-    }
+    // 注意:使用 "Pipeline script from SCM" 模式时,
+    // Jenkins 会自动 checkout 代码到 workspace,不需要在 Jenkinsfile 里再写 Checkout stage。
 
     stage('人工审批') {
       when {
@@ -80,20 +67,17 @@ pipeline {
     stage('Build Images') {
       steps {
         script {
+          // 直接在当前 workspace(Jenkins 已 checkout 的代码根)里构建
           if (env.REGISTRY?.trim()) {
             withDockerRegistry(credentialsId: env.REGISTRY_CRED, url: "") {
-              dir(env.CODE_DIR) {
-                sh "docker build -f ${DOCKERFILE_STORE} -t ${IMAGE_STORE} ."
-                sh "docker build -f ${DOCKERFILE_GATEWAY} -t ${IMAGE_GATEWAY} ."
-                sh "docker build -f ${DOCKERFILE_CONTRACT} -t ${IMAGE_CONTRACT} ."
-              }
-            }
-          } else {
-            dir(env.CODE_DIR) {
               sh "docker build -f ${DOCKERFILE_STORE} -t ${IMAGE_STORE} ."
               sh "docker build -f ${DOCKERFILE_GATEWAY} -t ${IMAGE_GATEWAY} ."
               sh "docker build -f ${DOCKERFILE_CONTRACT} -t ${IMAGE_CONTRACT} ."
             }
+          } else {
+            sh "docker build -f ${DOCKERFILE_STORE} -t ${IMAGE_STORE} ."
+            sh "docker build -f ${DOCKERFILE_GATEWAY} -t ${IMAGE_GATEWAY} ."
+            sh "docker build -f ${DOCKERFILE_CONTRACT} -t ${IMAGE_CONTRACT} ."
           }
         }
       }