adding cleanup logic

thelamer · thelamer · commit 68461134cfb5 · 2019-03-01T12:50:34.000-08:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -285,6 +285,9 @@ pipeline {
                            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
               sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"
               sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"
+              sh ```docker rmi \
+                    ${IMAGE}:arm32v6-${META_TAG} \
+                    lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ```
             }
           }
         }
@@ -311,6 +314,9 @@ pipeline {
                            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
               sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
               sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+              sh ```docker rmi \
+                    ${IMAGE}:arm64v8-${META_TAG} \
+                    lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ```
             }
           }
         }
@@ -472,6 +478,10 @@ pipeline {
           sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest"
           sh "docker push ${IMAGE}:latest"
           sh "docker push ${IMAGE}:${META_TAG}"
+          sh ```docker rmi \
+                ${IMAGE}:${META_TAG} \
+                ${IMAGE}:latest ```
+                
         }
       }
     }
@@ -519,6 +529,15 @@ pipeline {
           sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"
           sh "docker manifest push --purge ${IMAGE}:latest"
           sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
+          sh ```docker rmi \
+                ${IMAGE}:amd64-${META_TAG} \
+                ${IMAGE}:amd64-latest \
+                ${IMAGE}:arm32v6-${META_TAG} \
+                ${IMAGE}:arm32v6-latest \
+                ${IMAGE}:arm64v8-${META_TAG} \
+                ${IMAGE}:arm64v8-latest \
+                lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} \
+                lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ```
         }
       }
     }
diff --git a/roles/generate-jenkins/templates/Jenkinsfile.j2 b/roles/generate-jenkins/templates/Jenkinsfile.j2
@@ -453,6 +453,9 @@ pipeline {
                            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
               sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"
               sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"
+              sh ```docker rmi \
+                    ${IMAGE}:arm32v6-${META_TAG} \
+                    lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ```
             }
           }
         }
@@ -479,6 +482,9 @@ pipeline {
                            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
               sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
               sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+              sh ```docker rmi \
+                    ${IMAGE}:arm64v8-${META_TAG} \
+                    lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ```
             }
           }
         }
@@ -640,6 +646,10 @@ pipeline {
           sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:{{ release_tag }}"
           sh "docker push ${IMAGE}:{{ release_tag }}"
           sh "docker push ${IMAGE}:${META_TAG}"
+          sh ```docker rmi \
+                ${IMAGE}:${META_TAG} \
+                ${IMAGE}:{{ release_tag }} ```
+                
         }
       }
     }
@@ -687,6 +697,15 @@ pipeline {
           sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"
           sh "docker manifest push --purge ${IMAGE}:{{ release_tag }}"
           sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
+          sh ```docker rmi \
+                ${IMAGE}:amd64-${META_TAG} \
+                ${IMAGE}:amd64-{{ release_tag }} \
+                ${IMAGE}:arm32v6-${META_TAG} \
+                ${IMAGE}:arm32v6-{{ release_tag }} \
+                ${IMAGE}:arm64v8-${META_TAG} \
+                ${IMAGE}:arm64v8-{{ release_tag }} \
+                lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} \
+                lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ```
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -285,6 +285,9 @@ pipeline {`
`285`	`285`	`--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."`
`286`	`286`	`sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"`
`287`	`287`	`sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"`
	`288`	+ sh ```docker rmi \
	`289`	`+ ${IMAGE}:arm32v6-${META_TAG} \`
	`290`	+ lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ```
`288`	`291`	`}`
`289`	`292`	`}`
`290`	`293`	`}`
`@@ -311,6 +314,9 @@ pipeline {`
`311`	`314`	`--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."`
`312`	`315`	`sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"`
`313`	`316`	`sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"`
	`317`	+ sh ```docker rmi \
	`318`	`+ ${IMAGE}:arm64v8-${META_TAG} \`
	`319`	+ lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ```
`314`	`320`	`}`
`315`	`321`	`}`
`316`	`322`	`}`
`@@ -472,6 +478,10 @@ pipeline {`
`472`	`478`	`sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest"`
`473`	`479`	`sh "docker push ${IMAGE}:latest"`
`474`	`480`	`sh "docker push ${IMAGE}:${META_TAG}"`
	`481`	+ sh ```docker rmi \
	`482`	`+ ${IMAGE}:${META_TAG} \`
	`483`	+ ${IMAGE}:latest ```
	`484`	`+`
`475`	`485`	`}`
`476`	`486`	`}`
`477`	`487`	`}`
`@@ -519,6 +529,15 @@ pipeline {`
`519`	`529`	`sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"`
`520`	`530`	`sh "docker manifest push --purge ${IMAGE}:latest"`
`521`	`531`	`sh "docker manifest push --purge ${IMAGE}:${META_TAG}"`
	`532`	+ sh ```docker rmi \
	`533`	`+ ${IMAGE}:amd64-${META_TAG} \`
	`534`	`+ ${IMAGE}:amd64-latest \`
	`535`	`+ ${IMAGE}:arm32v6-${META_TAG} \`
	`536`	`+ ${IMAGE}:arm32v6-latest \`
	`537`	`+ ${IMAGE}:arm64v8-${META_TAG} \`
	`538`	`+ ${IMAGE}:arm64v8-latest \`
	`539`	`+ lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} \`
	`540`	+ lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ```
`522`	`541`	`}`
`523`	`542`	`}`
`524`	`543`	`}`
Original file line number	Diff line number	Diff line change
`@@ -453,6 +453,9 @@ pipeline {`
`453`	`453`	`--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."`
`454`	`454`	`sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"`
`455`	`455`	`sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"`
	`456`	+ sh ```docker rmi \
	`457`	`+ ${IMAGE}:arm32v6-${META_TAG} \`
	`458`	+ lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ```
`456`	`459`	`}`
`457`	`460`	`}`
`458`	`461`	`}`
`@@ -479,6 +482,9 @@ pipeline {`
`479`	`482`	`--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."`
`480`	`483`	`sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"`
`481`	`484`	`sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"`
	`485`	+ sh ```docker rmi \
	`486`	`+ ${IMAGE}:arm64v8-${META_TAG} \`
	`487`	+ lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ```
`482`	`488`	`}`
`483`	`489`	`}`
`484`	`490`	`}`
`@@ -640,6 +646,10 @@ pipeline {`
`640`	`646`	`sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:{{ release_tag }}"`
`641`	`647`	`sh "docker push ${IMAGE}:{{ release_tag }}"`
`642`	`648`	`sh "docker push ${IMAGE}:${META_TAG}"`
	`649`	+ sh ```docker rmi \
	`650`	`+ ${IMAGE}:${META_TAG} \`
	`651`	+ ${IMAGE}:{{ release_tag }} ```
	`652`	`+`
`643`	`653`	`}`
`644`	`654`	`}`
`645`	`655`	`}`
`@@ -687,6 +697,15 @@ pipeline {`
`687`	`697`	`sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"`
`688`	`698`	`sh "docker manifest push --purge ${IMAGE}:{{ release_tag }}"`
`689`	`699`	`sh "docker manifest push --purge ${IMAGE}:${META_TAG}"`
	`700`	+ sh ```docker rmi \
	`701`	`+ ${IMAGE}:amd64-${META_TAG} \`
	`702`	`+ ${IMAGE}:amd64-{{ release_tag }} \`
	`703`	`+ ${IMAGE}:arm32v6-${META_TAG} \`
	`704`	`+ ${IMAGE}:arm32v6-{{ release_tag }} \`
	`705`	`+ ${IMAGE}:arm64v8-${META_TAG} \`
	`706`	`+ ${IMAGE}:arm64v8-{{ release_tag }} \`
	`707`	`+ lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} \`
	`708`	+ lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ```
`690`	`709`	`}`
`691`	`710`	`}`
`692`	`711`	`}`