From 4c7c33d47fbf7acd4af3ec6d04a784983ef47eed Mon Sep 17 00:00:00 2001
From: Marija Stopa <mstopa@griddynamics.com>
Date: Fri, 17 Jan 2025 15:24:12 +0100
Subject: [PATCH] Update Jenkinsfile

---
 Jenkinsfile | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ee3bf549e..db4d421cf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
 pipeline {
     agent any
     environment {
-        DOCKER_CREDENTIALS_ID = 'dockerhub-credentials'
+        DOCKER_CREDENTIALS_ID = 'dockerhub-credentials' // ID DockerHub
     }
     stages {
         stage('Checkstyle') {
@@ -35,9 +35,23 @@ pipeline {
                     withCredentials([usernamePassword(credentialsId: "${DOCKER_CREDENTIALS_ID}", usernameVariable: 'DOCKER_USERNAME', passwordVariable: 'DOCKER_PASSWORD')]) {
                         def repoName = env.BRANCH_NAME == 'main' ? 'main-jenkins' : 'mr-jenkins'
                         def tag = env.GIT_COMMIT?.substring(0, 7) ?: 'latest'
+                        
+                        // Build Docker image
                         sh """
                             docker login -u \$DOCKER_USERNAME --password \$DOCKER_PASSWORD
                             docker build -t marijastopa/${repoName}:${tag} .
+                        """
+                        
+                        // Tag 'latest' for main branch
+                        if (env.BRANCH_NAME == 'main') {
+                            sh """
+                                docker tag marijastopa/${repoName}:${tag} marijastopa/${repoName}:latest
+                                docker push marijastopa/${repoName}:latest
+                            """
+                        }
+                        
+                        // Push SHA tag
+                        sh """
                             docker push marijastopa/${repoName}:${tag}
                         """
                     }