From d167310655364a144a4ada2cd07e84d8a4b625df Mon Sep 17 00:00:00 2001
From: test <test@zilliz.com>
Date: Wed, 16 Oct 2019 23:07:48 +0800
Subject: [PATCH] update ci/jenkins/jenkinsfile/publishImages.groovy

Former-commit-id: ed9ab1fd6cf8602965965459ec503233b4c682d4
---
 ci/jenkins/jenkinsfile/publishImages.groovy | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/ci/jenkins/jenkinsfile/publishImages.groovy b/ci/jenkins/jenkinsfile/publishImages.groovy
index 6c9ba1452..55864d64e 100644
--- a/ci/jenkins/jenkinsfile/publishImages.groovy
+++ b/ci/jenkins/jenkinsfile/publishImages.groovy
@@ -2,6 +2,8 @@ container('publish-images') {
     timeout(time: 15, unit: 'MINUTES') {
         dir ("docker/deploy/${OS_NAME}") {
             def binaryPackage = "${PROJECT_NAME}-${PACKAGE_VERSION}.tar.gz"
+            def dockerRegistryURL = "registry.zilliz.com"
+
             withCredentials([usernamePassword(credentialsId: "${params.JFROG_CREDENTIALS_ID}", usernameVariable: 'JFROG_USERNAME', passwordVariable: 'JFROG_PASSWORD')]) {
                 def downloadStatus = sh(returnStatus: true, script: "curl -u${JFROG_USERNAME}:${JFROG_PASSWORD} -O ${params.JFROG_ARTFACTORY_URL}/milvus/package/${binaryPackage}")
 
@@ -17,14 +19,29 @@ container('publish-images') {
                 if (isExistImage == 0) {
                     sh "docker rmi ${imageName}"
                 }
+
                 def customImage = docker.build("${imageName}")
-                docker.withRegistry('https://registry.zilliz.com', "${params.DOCKER_CREDENTIALS_ID}") {
+
+                isExistImage = sh(returnStatus: true, script: "docker inspect --type=image ${dockerRegistryURL}/${imageName}")
+                if (isExistImage == 0) {
+                    sh "docker rmi ${dockerRegistryURL}/${imageName}"
+                }
+
+                docker.withRegistry("${dockerRegistryURL}", "${params.DOCKER_CREDENTIALS_ID}") {
                     customImage.push()
                 }
             } catch (exc) {
                 throw exc
             } finally {
-                sh "docker rmi ${imageName}"
+                def isExistImage = sh(returnStatus: true, script: "docker inspect --type=image ${imageName}")
+                if (isExistImage == 0) {
+                    sh "docker rmi ${imageName}"
+                }
+
+                isExistImage = sh(returnStatus: true, script: "docker inspect --type=image ${dockerRegistryURL}/${imageName}")
+                if (isExistImage == 0) {
+                    sh "docker rmi ${dockerRegistryURL}/${imageName}"
+                }
             }
         } 
     }
-- 
GitLab