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 $(git log -p -1 --pretty=format:"%h"|head -n1) > /tmp/version && cd customer-api \
+    && echo ${branch}-$(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

@@ -8,12 +8,13 @@ pipeline {
     SWARM_GIT_URL='ssh://git@git.sdsys.ru:8022/iru/stack-deploy.git'
     SWARM_GIT_NAME='stack-deploy'
     JENKINS_MAIL='jenkins@sdsys.ru'
+    NEWTAG=''
   }
   parameters {
     string(
-      name: "repo",
-      defaultValue: "prod",
-      description: "Repository to build and/or deploy from."
+      name: "GitBranch",
+      defaultValue: "newPromoSpring",
+      description: "Which branch to use"
     )
     string(
       name: "service_update",
@@ -36,13 +37,19 @@ pipeline {
              """
         }
         echo "Building ${DOCKER_REGISTRY}/iru/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}."
-        sh "docker build --build-arg repo=${repo} --no-cache -t ${DOCKER_REGISTRY}/iru/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} ."
+        sh "docker build --build-arg branch=${GitBranch} --no-cache -t ${DOCKER_REGISTRY}/iru/${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 = 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}/iru/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}"
-        sh "docker push ${DOCKER_REGISTRY}/iru/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}"
+        echo "Publishing ${DOCKER_REGISTRY}/iru/${DOCKER_IMAGE}:${NEWTAG}"
+        sh "docker push ${DOCKER_REGISTRY}/iru/${DOCKER_IMAGE}:${NEWTAG}"
       }
     }
     stage("Update") {
@@ -52,7 +59,7 @@ pipeline {
           for (String item : service_update.split()) {
             try{
               echo "Updating $item"
-              sh "docker service update $item --image ${DOCKER_REGISTRY}/iru/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}"
+              sh "docker service update $item --image ${DOCKER_REGISTRY}/iru/${DOCKER_IMAGE}:${NEWTAG}"
             }
             catch(err){
               echo "Recovering service $item"
@@ -73,7 +80,7 @@ pipeline {
           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}.version
                 git add -A
                 git config --global user.email "${JENKINS_MAIL}"
                 git config --global user.name "Jenkins"

application-logger.xml

@@ -1,28 +0,0 @@
-<configuration>
-
-    <conversionRule conversionWord="coloredLevel" converterClass="play.api.Logger$ColoredLevel"/>
-    <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%coloredLevel %date %logger{30} - %message%n%xException{5}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- Libraries -->
-    <logger name="com.ning" level="WARN"/>
-    <logger name="org.bson" level="WARN"/>
-    <logger name="javax.management" level="WARN"/>
-    <logger name="memcached" level="WARN"/>
-    <logger name="db" level="DEBUG"/>
-
-    <!-- Application -->
-    <logger name="play" level="WARN"/>
-    <logger name="application" level="DEBUG"/>
-
-    <logger name="promo.loader" level="DEBUG"/>
-
-    <root level="WARN">
-        <appender-ref ref="stdout"/>
-        <appender-ref ref="file"/>
-    </root>
-
-</configuration>