Merge branch 'master' of ssh://git.sdsys.ru:8022/labportal/admin

Jenkinsfile

@@ -2,9 +2,6 @@ pipeline {
   agent {
     label "swarm"
   }
-  options {
-        ansiColor('xterm')
-  }
   environment {
     DOCKER_REGISTRY='dev-registry.infoclinica.ru:5000'
     DOCKER_IMAGE='lab/admin-lab'
@@ -40,7 +37,7 @@ pipeline {
   stages {
     stage("Build") {
       steps {
-        echo "\u001B[32m \u2600 Building \u001B[35m ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}. \u001B[0m"
+        echo "Building ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}."
         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
@@ -52,7 +49,7 @@ pipeline {
     }
     stage("Publish") {
       steps {
-        echo "\u001B[32m \u2600 Publishing \u001B[35m ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG} \u001B[0m"
+        echo "Publishing ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG}"
         sh "docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG}"
       }
     }
@@ -61,12 +58,12 @@ pipeline {
       steps {
         script {
           for (String item : service_update.split()) {
-            echo "\u001B[32m \u2600 Updating \u27A1 ${item} \u001B[0m"
+            echo "Updating ${item}"
             try{
               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"
+              echo "Recovering service $item"
               sh "DOCKER_HOST=${DHOST} docker service rollback ${item}"
               throw err
             }
@@ -76,7 +73,7 @@ pipeline {
     }
     stage("Tagging") {
       steps{
-        echo "\u001B[32m \u2600 Setting latest tag \u001B[0m"
+        echo "Setting latest tag"
         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"
@@ -98,7 +95,7 @@ pipeline {
   }
   post {
     always {
-      echo "\u001B[32m \u2600 CleaningUp work diretory \u001B[0m"
+      echo "CleaningUp work diretory"
       deleteDir()
       sh "docker image rm -f `docker image ls -q ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}`"
     }