From 64886356163e3a842e26aa9136c51c470666df77 Mon Sep 17 00:00:00 2001
From: Tushar <30565750+tushar5526@users.noreply.github.com>
Date: Wed, 15 Feb 2023 17:00:29 +0530
Subject: [PATCH] Update Jenkinsfile

---
 build/Jenkinsfile | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/build/Jenkinsfile b/build/Jenkinsfile
index d35459e..e448af3 100644
--- a/build/Jenkinsfile
+++ b/build/Jenkinsfile
@@ -1,33 +1,39 @@
 node() {
-    properties([
-        parameters([
-            string(name: 'docker_repo', defaultValue: 'user-service', description: 'Docker Image Name'),
-            string(name: 'docker_server', defaultValue: 'localhost:5000', description: 'Docker Registry URL'),
+    withCredentials([string(credentialsId: 'docker_server', variable: 'docker_server')]) {
+        properties([
+            parameters([
+                string(name: 'docker_repo', defaultValue: 'samagragovernance/esamwad-user-service', description: 'Docker Image Name'),
+                string(name: 'docker_server', defaultValue: "$docker_server", description: 'Docker Registry URL'),
 
+            ])
         ])
-    ])
+    }
     stage('Checkout') {
             cleanWs()
             checkout scm
-            commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-            env.commit_id = sh(script: 'echo ' + env.docker_repo + '_' + commit_hash + '_' + env.BRANCH_NAME, returnStdout: true).trim()
+            env.commit_id = env.BRANCH_NAME
             echo "${env.commit_id}"
     }
 
     stage('docker-build') {
+        sh '''
+        docker build -f build/Dockerfile -t $docker_server/$docker_repo:$commit_id .
+        '''
+        if (env.BRANCH_NAME == 'main' || env.BRANCH_NAME == 'master') {
             sh '''
-                docker build  -f build/Dockerfile -t $docker_server/$docker_repo:$commit_id .
-                '''
+            docker build -f build/Dockerfile -t $docker_server/$docker_repo:$commit_id .
+            '''
+        }
     }
 
     stage('docker-push') {
         sh '''
-                docker push $docker_server/$docker_repo:$commit_id
-                '''
-    }
-    stage('ArchiveArtifacts') {
-        sh("echo ${commit_id} > commit_id.txt")
-                archiveArtifacts 'commit_id.txt'
-                currentBuild.description = "${commit_id}"
+        docker push $docker_server/$docker_repo:$commit_id
+        '''
+        if (env.BRANCH_NAME == 'main' || env.BRANCH_NAME == 'master') {
+            sh '''
+            docker push $docker_server/$docker_repo:latest
+            '''
+        }
     }
-}
\ No newline at end of file
+}
-- 
GitLab