refactor: encapsulate Docker build and tag logic within a script block in Jenkinsfile.

3 weeks ago · 5105219a4d
parent 421642495e
commit 5105219a4d
1 changed files with 9 additions and 5 deletions
--- a/12
+++ b/12
@ -54,11 +54,15 @@ pipeline {
        stage('Build & Tag') {
            steps {
                withCredentials([string(credentialsId: GITEA_ID, variable: 'GITEA_TOKEN')]) {
-                    def fullImageName = "${DOCKER_HUB_USERNAME}/${IMAGE_NAME}"
-                    sh "docker build --build-arg GITEA_TOKEN=${GITEA_TOKEN} -t ${fullImageName}:${IMAGE_TAG} ."
+                    // Logic and variable definitions go inside 'script'
+                    script {
+                        def fullImageName = "${DOCKER_HUB_USERNAME}/${IMAGE_NAME}"
                        
-                    if (SECONDARY_TAG) {
-                        sh "docker tag ${fullImageName}:${IMAGE_TAG} ${fullImageName}:${SECONDARY_TAG}"
+                        sh "docker build --build-arg GITEA_TOKEN=${GITEA_TOKEN} -t ${fullImageName}:${IMAGE_TAG} ."
+                        
+                        if (SECONDARY_TAG) {
+                            sh "docker tag ${fullImageName}:${IMAGE_TAG} ${fullImageName}:${SECONDARY_TAG}"
+                        }
                    }
                }
            }