Solve merge conflict

Dockerfile

@@ -5,7 +5,7 @@ COPY docker-entrypoint.sh \
      healthcheck.sh \
      /opt/
 COPY mongodb-org-3.6.repo /etc/yum.repos.d/
-ENV CATALINA_HOME="/opt/tomcat" 
+ENV CATALINA_HOME="/opt/tomcat"
 ENV PATH=$CATALINA_HOME/bin:$PATH \
     CATALINA_OPTS="-Dconfig.file=/etc/web-laboratory-admin/application.conf" \
     JAVA_HOME=/usr/java/default \

Jenkinsfile

@@ -7,12 +7,13 @@ pipeline {
   }
   environment {
     DOCKER_REGISTRY='dev-registry.infoclinica.ru:5000'
-    DOCKER_IMAGE='admin-lab'
-    SWARM_GIT_URL='ssh://git@git.sdsys.ru:8022/iru/stack-deploy.git'
+    DOCKER_IMAGE='lab/admin-lab'
+    SWARM_GIT_URL='ssh://git@git.sdsys.ru:8022/labportal/stack-deploy.git'
     SWARM_GIT_NAME='stack-deploy'
+    PACKAGE_NAME='web-laboratory-admin'
     JENKINS_MAIL='jenkins@sdsys.ru'
-    CLUSTER_DEV='dev-iru-swarm.infoclinica.lan'
-    CLUSTER_PROD='iru-swarm.infoclinica.ru'
+    DOCKER_CERT_PATH='/run/secrets/swarm'
+    DHOST='tcp://dev-iru-swarm.infoclinica.lan:2376 DOCKER_TLS_VERIFY=1'
   }
   parameters {
     string(
@@ -25,14 +26,9 @@ pipeline {
       defaultValue: "16.1",
       description: "Witch version to build and/or deploy."
     )
-    string(
-      name: "cluster",
-      defaultValue: "dev",
-      description: "Cluster to deploy (dev or prod)."
-    )
     string(
       name: "service_update",
-      defaultValue: "lab_admin",
+      defaultValue: "lab_admin-lab",
       description: "Services to update."
     )
     string(
@@ -44,15 +40,20 @@ pipeline {
   stages {
     stage("Build") {
       steps {
-        echo "\u001B[32m \u2600 Building \u001B[35m ${DOCKER_REGISTRY}/iru/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}. \u001B[0m"
-        sh '''set +x
-            docker build --build-arg repo=${repo} --build-arg version=${version} --no-cache -t ${DOCKER_REGISTRY}/iru/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} .'''
+        echo "\u001B[32m \u2600 Building \u001B[35m ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}. \u001B[0m"
+        sh "docker build --build-arg repo=${repo} --build-arg version=${version} --no-cache -t ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} ."
+        script {
+           NEWTAG = sh script: "docker run --rm --entrypoint=\"\" ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} rpm -q --qf %{VERSION}-%{RELEASE} ${PACKAGE_NAME} 2> /dev/null", returnStdout: true
+           NEWTAG = repo + "-" + NEWTAG + "_" + BUILD_NUMBER
+           echo "NEWTAG is $NEWTAG"
+        }
+        sh "docker tag ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG}"
       }
     }
-/*    stage("Publish") {
+    stage("Publish") {
       steps {
-        echo "\u001B[32m \u2600 Publishing \u001B[35m ${DOCKER_REGISTRY}/iru/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} \u001B[0m"
-        sh "docker push ${DOCKER_REGISTRY}/iru/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}"
+        echo "\u001B[32m \u2600 Publishing \u001B[35m ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG} \u001B[0m"
+        sh "docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG}"
       }
     }
     stage("Update") {
@@ -60,75 +61,46 @@ pipeline {
       steps {
         script {
           for (String item : service_update.split()) {
+            echo "\u001B[32m \u2600 Updating \u27A1 ${item} \u001B[0m"
             try{
-              echo "\u001B[32m \u2600 Updating \u27A1 $item \u001B[0m"
-              if (cluster == 'prod') {
-                withEnv(["service_name=${item}"]) {
-                  sh '''export DOCKER_CERT_PATH=/run/secrets/swarm
-                        export DOCKER_HOST=tcp://${CLUSTER_PROD}:2376 DOCKER_TLS_VERIFY=1
-                        docker service update ${service_name} --image ${DOCKER_REGISTRY}/iru/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}
-                      '''
-                }
-              }
-              if (cluster == 'dev') {
-                withEnv(["service_name=${item}"]) {
-                  sh '''export DOCKER_CERT_PATH=/run/secrets/swarm
-                        export DOCKER_HOST=tcp://${CLUSTER_DEV}:2376 DOCKER_TLS_VERIFY=1
-                        docker service update ${service_name} --image ${DOCKER_REGISTRY}/iru/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}
-                     '''
-                }
-              }
+              sh "DOCKER_HOST=${DHOST} docker service update ${item} --image ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG}"
             }
             catch(err){
               echo "\u001B[32m \u2600 Recovering service \u27A1 $item \u001B[0m"
-              if (cluster == 'prod') {
-                withEnv(["service_name=${item}"]) {
-                  sh '''export DOCKER_CERT_PATH=/run/secrets/swarm
-                        export DOCKER_HOST=tcp://${CLUSTER_PROD}:2376 DOCKER_TLS_VERIFY=1
-                        docker service rollback ${service_name}
-                     '''
-                }
-              }
-              if (cluster == 'dev') {
-                withEnv(["service_name=${item}"]) {
-                  sh '''export DOCKER_CERT_PATH=/run/secrets/swarm
-                        export DOCKER_HOST=tcp://${CLUSTER_DEV}:2376 DOCKER_TLS_VERIFY=1
-                        docker service rollback ${service_name}
-                     '''
-                }
-              }
+              sh "DOCKER_HOST=${DHOST} docker service rollback ${item}"
               throw err
             }
           }
         }
       }
     }
-    stage("Tagging"){
+    stage("Tagging") {
       steps{
         echo "\u001B[32m \u2600 Setting latest tag \u001B[0m"
-        sh '''docker tag ${DOCKER_REGISTRY}/iru/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} ${DOCKER_REGISTRY}/iru/${DOCKER_IMAGE}:latest
-              docker push ${DOCKER_REGISTRY}/iru/${DOCKER_IMAGE}:latest'''
-        echo "\u001B[32m \u2600 Updating tag info in \u001B[35m ${SWARM_GIT_NAME} repository \u001B[0m"
+        sh """ docker tag ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG} ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:latest
+               docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:latest """
+        echo "Updating tag info in ${SWARM_GIT_NAME} repository"
         withCredentials([sshUserPrivateKey(credentialsId: 'provision', keyFileVariable: 'GIT_SSH_KEY', passphraseVariable: '', usernameVariable: 'GIT_SSH_USERNAME')]) {
-          sh '''GIT_SSH_COMMAND='ssh -i ${GIT_SSH_KEY} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' \
-                  git clone ${SWARM_GIT_URL}
+          sh """GIT_SSH_COMMAND='ssh -i ${GIT_SSH_KEY} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' \
+                git clone ${SWARM_GIT_URL}
                 cd ${SWARM_GIT_NAME}
-                echo -n ${repo}-${BUILD_NUMBER} > tags/${DOCKER_IMAGE}.version
+                echo -n ${NEWTAG} > tags/${DOCKER_IMAGE}.dev-version
                 git add -A
                 git config --global user.email "${JENKINS_MAIL}"
                 git config --global user.name "Jenkins"
                 git commit -m 'Version update'
                 GIT_SSH_COMMAND='ssh -i ${GIT_SSH_KEY} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' \
-                  git push origin master
-                ls'''
+                git push origin master
+                ls"""
         }
       }
     }
-*/  }
+  }
   post {
     always {
       echo "\u001B[32m \u2600 CleaningUp work diretory \u001B[0m"
       deleteDir()
+      sh "docker image rm -f `docker image ls -q ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}`"
     }
     failure {
       mail charset: 'UTF-8',
@@ -145,4 +117,4 @@ pipeline {
            body: "<b>Congradulations!!!</b> <b><br> Jenkins job succefully finished.\n\n <b><br>Project Name:</b> ${env.JOB_NAME} <b><br>\nBuild Number:</b> ${env.BUILD_NUMBER} <b><br>\nURL Build:</b> ${RUN_DISPLAY_URL}"
     }
   }
-}
+}

Jenkinsfile-prod

@@ -0,0 +1,98 @@
+pipeline {
+  agent {
+    label "swarm"
+  }
+  environment {
+    DOCKER_IMAGE='lab/admin-lab'
+    DOCKER_CERT_PATH='/run/secrets/swarm'
+    DHOST='tcp://iru-swarm.infoclinica.lan:2376 DOCKER_TLS_VERIFY=1'
+    DEV_REGISTRY='dev-registry.infoclinica.ru:5000'
+    PROD_REGISTRY='registry.infoclinica.ru:5000'
+    SWARM_GIT_URL='ssh://git@git.sdsys.ru:8022/labportal/stack-deploy.git'
+    SWARM_GIT_NAME='stack-deploy'
+    JENKINS_MAIL='jenkins@sdsys.ru'
+    NEWTAG=''
+  }
+  parameters {
+    string(
+      name: "service_update",
+      defaultValue: "lab_admin-lab",
+      description: "Service name to update."
+    )
+    string(
+      name: "mailto",
+      defaultValue: "admin@sdsys.ru",
+      description: "Email which has to be notified."
+    )
+  }
+  stages {
+    stage("Tagging in Git"){
+      steps{
+        withCredentials([sshUserPrivateKey(credentialsId: 'provision', keyFileVariable: 'GIT_SSH_KEY', passphraseVariable: '', usernameVariable: 'GIT_SSH_USERNAME')]) {
+          sh """GIT_SSH_COMMAND='ssh -i ${GIT_SSH_KEY} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' \
+                git clone ${SWARM_GIT_URL}
+                cd ${SWARM_GIT_NAME}
+                cp -f tags/${DOCKER_IMAGE}.dev-version tags/${DOCKER_IMAGE}.version
+                git add -A
+                git config --global user.email "${JENKINS_MAIL}"
+                git config --global user.name "Jenkins"
+                git commit -m 'Version update'| grep ''     # Shield ourself from non-zero exit code from 'git commit' command
+                GIT_SSH_COMMAND='ssh -i ${GIT_SSH_KEY} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' \
+                git push origin master
+                ls"""
+        }
+      }
+    }
+    stage("Tagging and pushing to prod registry"){
+      steps{
+        script {
+          NEWTAG=sh (script: "cat ${SWARM_GIT_NAME}/tags/${DOCKER_IMAGE}.version", returnStdout: true).trim()
+          sh """docker pull ${DEV_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG}
+                docker tag ${DEV_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG} ${PROD_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG}
+                docker tag ${DEV_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG} ${PROD_REGISTRY}/${DOCKER_IMAGE}:latest
+                docker push ${PROD_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG}
+                docker push ${PROD_REGISTRY}/${DOCKER_IMAGE}:latest
+             """
+        }
+      }
+    }
+    stage("Updating service"){
+      steps{
+        script {
+          for (String item : service_update.split()) {
+            echo "Updating ${item}"
+            try{
+              sh "DOCKER_HOST=${DHOST} docker service update ${item} --image ${PROD_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG}"
+            }
+            catch(err){
+              echo "Recovering service $item"
+              sh "DOCKER_HOST=${DHOST} docker service rollback ${item}"
+              throw err
+            }
+          }
+        }
+      }
+    }
+  }
+  post {
+    always {
+      echo "CleaningUp work diretory"
+      deleteDir()
+      sh "docker image rm -f `docker image ls -q ${PROD_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG}`"
+    }
+    failure {
+      mail charset: 'UTF-8',
+           subject: "Jenkins build ERROR",
+           mimeType: 'text/html',
+           to: "${mailto}",
+           body: "<b>ATTENTION!!!</b> <b><br> Jenkins job failed.\n\n <b><br>Project Name:</b> ${env.JOB_NAME} <b><br>\nBuild Number:</b> ${env.BUILD_NUMBER} <b><br>\nURL Build:</b> ${RUN_DISPLAY_URL}"
+    }
+    success {
+      mail charset: 'UTF-8',
+           subject: "Jenkins build SUSCCESS",
+           mimeType: 'text/html',
+           to: "${mailto}",
+           body: "<b>Congradulations!!!</b> <b><br> Jenkins job succefully finished.\n\n <b><br>Project Name:</b> ${env.JOB_NAME} <b><br>\nBuild Number:</b> ${env.BUILD_NUMBER} <b><br>\nURL Build:</b> ${RUN_DISPLAY_URL}"
+    }
+  }
+}