CI: Only clean images if there are any

chris-crone · ndeloof · commit 7ddb2ee019cd · 2019-10-28T12:57:38.000+01:00
Signed-off-by: Christopher Crone &lt;christopher.crone@docker.com&gt;
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -57,7 +57,7 @@ pipeline {
                                         archiveArtifacts 'bin/*.tar.gz'
                                     }
                                 } finally {
-                                    def clean_images = /docker image ls --format="{{.Repository}}:{{.Tag}}" '*$BUILD_TAG*' | xargs docker image rm -f/
+                                    def clean_images = /docker image ls --format="{{.Repository}}:{{.Tag}}" '*$BUILD_TAG*' | xargs --no-run-if-empty  docker image rm -f/
                                     sh clean_images
                                 }
                             }
diff --git a/Jenkinsfile.baguette b/Jenkinsfile.baguette
@@ -45,7 +45,7 @@ pipeline {
                                     }
                                     archiveArtifacts 'bin/*.tar.gz'
                                 } finally {
-                                    def clean_images = /docker image ls --format="{{.Repository}}:{{.Tag}}" '*$TAG*' | xargs docker image rm -f/
+                                    def clean_images = /docker image ls --format="{{.Repository}}:{{.Tag}}" '*$TAG*' | xargs --no-run-if-empty  docker image rm -f/
                                     sh clean_images
                                 }
                             }

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ pipeline {`
`57`	`57`	`archiveArtifacts 'bin/*.tar.gz'`
`58`	`58`	`}`
`59`	`59`	`} finally {`
`60`		`- def clean_images = /docker image ls --format="{{.Repository}}:{{.Tag}}" '$BUILD_TAG' \| xargs docker image rm -f/`
	`60`	`+ def clean_images = /docker image ls --format="{{.Repository}}:{{.Tag}}" '$BUILD_TAG' \| xargs --no-run-if-empty docker image rm -f/`
`61`	`61`	`sh clean_images`
`62`	`62`	`}`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ pipeline {`
`45`	`45`	`}`
`46`	`46`	`archiveArtifacts 'bin/*.tar.gz'`
`47`	`47`	`} finally {`
`48`		`- def clean_images = /docker image ls --format="{{.Repository}}:{{.Tag}}" '$TAG' \| xargs docker image rm -f/`
	`48`	`+ def clean_images = /docker image ls --format="{{.Repository}}:{{.Tag}}" '$TAG' \| xargs --no-run-if-empty docker image rm -f/`
`49`	`49`	`sh clean_images`
`50`	`50`	`}`
`51`	`51`	`}`