debug

Dockerfile

@@ -14,7 +14,7 @@ RUN yum install -y https://centos7.iuscommunity.org/ius-release.rpm \
     && printf "Host git.alfatell.ru \n\tStrictHostKeyChecking no" > /root/.ssh/config \
     && git clone ssh://gitolite@git.alfatell.ru:2223/web-registration-cloud.git \
     && cd web-registration-cloud && git checkout ${branch} \
-    && echo ${branch}-$(git log -p -1 --pretty=format:"%h"|head -n1) > /tmp/version && cd customer-api \
+    && echo $(git log -p -1 --pretty=format:"%h"|head -n1) > /tmp/version && cd customer-api \
     && mvn clean install && cd ../promo/ \
     && figlet -c Building Promo \
     && gradle tasks bootWar \

Jenkinsfile-dev

@@ -19,9 +19,9 @@ pipeline {
   }
   parameters {
     string(
-      name: "repo",
-      defaultValue: "prod",
-      description: "Repository to build and/or deploy from. Values - dev, prod."
+      name: "branch",
+      defaultValue: "newPromoSpring",
+      description: "Which branch to use"
     )
     string(
       name: "service_update",
@@ -44,14 +44,19 @@ pipeline {
                 chmod 600 ${WORKSPACE}/id_rsa
              """
         }
-        sh "docker build --build-arg repo=${repo} --no-cache -t ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} ."
-        
+        sh "docker build --build-arg branch=${branch} --no-cache -t ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${BUILD_NUMBER} ."
+        script {
+           NEWTAG = sh script: "docker run --rm ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${BUILD_NUMBER} cat /tmp/version 2> /dev/null", returnStdout: true
+           NEWTAG = branch + "-" + NEWTAG + "_" + BUILD_NUMBER
+           echo "NEWTAG is $NEWTAG"
+        }
+        sh "docker tag ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${BUILD_NUMBER} ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG}"
       }
     }
     stage("Publish") {
       steps {
-        echo "Publishing ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}"
-        sh "docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}"
+        echo "Publishing ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG}"
+        sh "docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG}"
       }
     }
     stage("Update") {
@@ -61,7 +66,7 @@ pipeline {
           for (String item : service_update.split()) {
             echo "Updating ${item}"
             try{
-               sh "DOCKER_HOST=${DHOST} docker service update ${item} --image ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}"
+               sh "DOCKER_HOST=${DHOST} docker service update ${item} --image ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG}"
             }
             catch(err){
                echo "Recovering service $item"
@@ -75,14 +80,14 @@ pipeline {
     stage("Tagging"){
       steps{
         echo "Setting latest tag"
-        sh """docker tag ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:latest
+        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}
                 cd ${SWARM_GIT_NAME}
-                echo -n ${repo}-${BUILD_NUMBER} > tags/${DOCKER_IMAGE}.dev-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"
@@ -98,7 +103,7 @@ pipeline {
     always {
       echo "CleaningUp work diretory"
       deleteDir()
-      sh "docker image rm -f `docker image ls -q ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}`"
+      sh "docker image rm -f `docker image ls -q ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${BUILD_NUMBER}`"
     }
     failure {
       mail charset: 'UTF-8',