推送完毕后清理镜像

c181824b · daidekun · 34afabfa · c181824b · c181824b
Commit c181824b authored Nov 17, 2017 by daidekun
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

StageBucket.groovy src/org/qg/StageBucket.groovy +2 -1

qgDockerPipeline.groovy vars/qgDockerPipeline.groovy +4 -1

No files found.
--- a/src/org/qg/StageBucket.groovy
+++ b/src/org/qg/StageBucket.groovy
@@ -100,7 +100,8 @@ def deploy(namespace, systemName, imageTag, tier, isDeploy) {
    }
 }

-def clean(contextDir) {
+def clean(contextDir, imageTag) {
+    sh "docker rmi -f $(docker images -q ${imageTag})"
    sh "rm -rf ${contextDir}"
 }


--- a/vars/qgDockerPipeline.groovy
+++ b/vars/qgDockerPipeline.groovy
@@ -88,9 +88,12 @@ def call(body) {
            }
            
            stage("Clean") {
-                _stage.clean(contextDir)
+                _stage.clean(contextDir, imageTag)
            }
        } catch (err) {
+            if (imageTag) {
+                _stage.clean(contextDir, imageTag)
+            }
            currentBuild.result = 'FAILED'
            throw err
        }