wadim 7 роки тому
батько
коміт
916d80c5f1
1 змінених файлів з 8 додано та 9 видалено
  1. 8 9
      Jenkinsfile

+ 8 - 9
Jenkinsfile

@@ -29,14 +29,14 @@ pipeline {
   stages {
     stage("Build") {
       steps {
-        echo "Building ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}."
-        sh "docker build --build-arg repo=${repo} --no-cache -t ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} ."
+        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} ."
       }
     }
     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}/iru/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}"
+        sh "docker push ${DOCKER_REGISTRY}/iru/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}"
       }
     }
     stage("Update") {
@@ -46,7 +46,7 @@ pipeline {
           for (String item : service_update.split()) {
             try{
               echo "Updating $item"
-              sh "docker service update $item --image ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}"
+              sh "docker service update $item --image ${DOCKER_REGISTRY}/iru/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}"
             }
             catch(err){
               echo "Recovering service $item"
@@ -60,14 +60,14 @@ pipeline {
     stage("Tagging"){
       steps{
         echo "Setting latest tag"
-        sh '''docker tag ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:latest
-              docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:latest'''
+        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 "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 ${BUILD_NUMBER} > tags/${DOCKER_IMAGE}.version
+                echo -n ${repo}-${BUILD_NUMBER} > tags/${DOCKER_IMAGE}.version
                 git add -A
                 git config --global user.email "${JENKINS_MAIL}"
                 git config --global user.name "Jenkins"
@@ -83,7 +83,6 @@ pipeline {
     always {
       echo "CleaningUp work diretory"
       deleteDir()
-      sh "ls"
     }
     failure {
       mail charset: 'UTF-8',