Bladeren bron

Code enhancements

Wadim Surkov 6 jaren geleden
bovenliggende
commit
da6705b203
1 gewijzigde bestanden met toevoegingen van 6 en 9 verwijderingen
  1. 6 9
      Jenkinsfile

+ 6 - 9
Jenkinsfile

@@ -13,7 +13,7 @@ pipeline {
     DEV_REGISTRY='dev-registry.infoclinica.ru:5000'
     PROD_REGISTRY='registry.infoclinica.ru:5000'
     DOCKER_CERT_PATH='/run/secrets/swarm'
-    DOCKER_HOST='somehost'
+    DOCKER_HOST=''
     DOCKER_REGISTRY=''
     NEWTAG=''
   }
@@ -57,13 +57,6 @@ pipeline {
                 error('Unknown cluster')
           }
         }
-
-        script {
-          sh "set"
-          currentBuild.result = 'ABORTED'
-          error ('Emergency stop')
-        }
-
         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} ."
         script {
@@ -83,11 +76,15 @@ pipeline {
     stage("Update") {
       when { expression { service_update != "" } }
       steps {
+        environment {
+          DOCKER_HOST=${DOCKER_HOST}
+        }
         script {
           for (String item : service_update.split()) {
             try{
                echo "Updating ${item}"
-               sh "DOCKER_HOST=$DOCKER_HOST DOCKER_CERT_PATH=$DOCKER_CERT_PATH docker service update ${item} --image ${DOCKER_REGISTRY}/iru/${DOCKER_IMAGE}:${NEWTAG}"
+               sh "set"
+               sh "docker service update ${item} --image ${DOCKER_REGISTRY}/iru/${DOCKER_IMAGE}:${NEWTAG}"
             }
             catch(err){
                echo "Recovering service $item"