Remove the cnab base image from the CI local daemon

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
docker · Jan 18, 2019 · 156d992 · 156d992
1 parent 9bad57b
commit 156d992
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 1 deletion.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -23,6 +23,11 @@ pipeline {
                             sh 'make -f docker.Makefile vendor'
                         }
                     }
+                    post {
+                        always {
+                            deleteDir()
+                        }
+                    }
                 }
                 stage("Binaries"){
                     agent {
@@ -73,6 +78,9 @@ pipeline {
                     }
                     post {
                         always {
+                            dir('src/github.com/docker/app') {
+                                sh 'make -f docker.Makefile clean-invocation-image'
+                            }
                             deleteDir()
                         }
                     }
@@ -93,6 +101,11 @@ pipeline {
                             archiveArtifacts '_build/ci-cov/coverage.html'
                         }
                     }
+                    post {
+                        always {
+                            deleteDir()
+                        }
+                    }
                 }
                 stage("Coverage (experimental)") {
                     agent {
@@ -104,6 +117,11 @@ pipeline {
                             sh 'make EXPERIMENTAL=on -f docker.Makefile coverage'
                         }
                     }
+                    post {
+                        always {
+                            deleteDir()
+                        }
+                    }
                 }
                 stage("Gradle test") {
                     agent {
@@ -148,6 +166,9 @@ pipeline {
                     }
                     post {
                         always {
+                            dir('src/github.com/docker/app') {
+                                sh 'make -f docker.Makefile clean-invocation-image'
+                            }
                             deleteDir()
                         }
                     }

diff --git a/Jenkinsfile.baguette b/Jenkinsfile.baguette
@@ -66,6 +66,9 @@ pipeline {
                     }
                     post {
                         always {
+                            dir('src/github.com/docker/app') {
+                                sh 'make -f docker.Makefile clean-invocation-image'
+                            }
                             deleteDir()
                         }
                     }
@@ -87,6 +90,11 @@ pipeline {
                             sh 'make -f docker.Makefile gradle-test'
                         }
                     }
+                    post {
+                        always {
+                            deleteDir()
+                        }
+                    }
                 }
                 stage("Test Linux") {
                     agent {
@@ -112,6 +120,9 @@ pipeline {
                     }
                     post {
                         always {
+                            dir('src/github.com/docker/app') {
+                                sh 'make -f docker.Makefile clean-invocation-image'
+                            }
                             deleteDir()
                         }
                     }
@@ -140,6 +151,9 @@ pipeline {
                     }
                     post {
                         always {
+                            dir('src/github.com/docker/app') {
+                                sh 'make -f docker.Makefile clean-invocation-image'
+                            }
                             deleteDir()
                         }
                     }
@@ -168,6 +182,10 @@ pipeline {
                     }
                     post {
                         always {
+                            dir('src/github.com/docker/app') {
+                                bat 'git --no-pager diff'
+                                bat 'make -f docker.Makefile clean-invocation-image'
+                            }
                             deleteDir()
                         }
                     }
@@ -193,7 +211,15 @@ pipeline {
                             unstash "invocation-image"
                             sh 'make -f docker.Makefile load-invocation-image'
                             sh 'make -f docker.Makefile push-invocation-image'
-                        }            
+                        }
+                    }
+                    post {
+                        always {
+                            dir('src/github.com/docker/app') {
+                                sh 'make -f docker.Makefile clean-invocation-image'
+                            }
+                            deleteDir()
+                        }
                     }
                 }
                 stage('Release Github binaries') {

diff --git a/docker.Makefile b/docker.Makefile
@@ -110,6 +110,9 @@ load-invocation-image:
 push-invocation-image:
 	docker push $(CNAB_BASE_INVOCATION_IMAGE_NAME)
 
+clean-invocation-image:
+	docker rmi $(CNAB_BASE_INVOCATION_IMAGE_NAME)
+
 help: ## this help
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort