From b63e92337fcb77a7c2de44278cd66f804aa0dffc Mon Sep 17 00:00:00 2001
From: Viktoriia Karpenko <vkarpenko@griddynamics.com>
Date: Fri, 20 Dec 2024 12:41:29 +0200
Subject: [PATCH] Edit Jenkinsfile

---
 Jenkinsfile | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1083cc775..b1c4a9a17 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,36 +8,30 @@ pipeline {
 
     stages {
         stage ('Checkstyle') {
-            when { not { branch 'main' } }
             steps {
                 sh 'mvn checkstyle:checkstyle'
                 archiveArtifacts artifacts: 'target/checkstyle-report.xml', allowEmptyArchive: true
             }
         }
         stage ('Test') {
-            when { not { branch 'main' } }
             steps {
                 sh 'mvn test'
             }
         }
         stage ('Build') {
-            when { not { branch 'main' } }
             steps {
                 sh 'mvn clean package -DskipTests'
                 archiveArtifacts artifacts: 'target/*.jar', allowEmptyArchive: false
             }
         }
-        stage ('Creating Docker Image') {
+        stage ('Creating Docker image') {
             steps {
-                script {
-                    def dockerRepo = branch == 'main' ? 'main' : 'mr'
-                    sh "docker build -t vkarpenko02/${dockerRepo}:${GIT_COMMIT} ."
-                    withCredentials([usernamePassword(credentialsId: 'docker_key', usernameVariable: 'DOCKER_HUB_USER', passwordVariable: 'DOCKER_HUB_PASS')]) {
-                        sh """
-                            echo ${DOCKER_HUB_PASS} | docker login -u ${DOCKER_HUB_USER} --password-stdin
-                            docker push vkarpenko02/${dockerRepo}:${GIT_COMMIT}
-                        """
-                    }
+                sh 'docker build -t vkarpenko02/mr:${GIT_COMMIT} .'
+                withCredentials([usernamePassword(credentialsId: 'docker_key', usernameVariable: 'DOCKER_HUB_USER', passwordVariable: 'DOCKER_HUB_PASS')]) {
+                    sh """
+                        echo ${DOCKER_HUB_PASS} | docker login -u ${DOCKER_HUB_USER} --password-stdin
+                        docker push vkarpenko02/mr:${GIT_COMMIT}
+                    """
                 }
             }
         }