Merge pull request #31 from chris-crone/ci-tag-images

CI improvements

Author: mnottale

Dockerfile.lint

@@ -1,5 +1,5 @@
+ARG ALPINE_VERSION=3.7
 ARG GO_VERSION=1.10.1
-ARG RUN_BASE_TAG=3.7
 
 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS lint-base
 RUN apk add --no-cache \

Jenkinsfile

@@ -1,15 +1,20 @@
 node('gcp-linux-worker-0') {
     stage('Build') {
         dir('src/github.com/docker/lunchbox') {
-            checkout scm
-            sh 'rm -f *.tar.gz'
-            sh 'docker image prune -f'
-            sh 'make ci-lint'
-            sh 'make ci-test'
-            sh 'make ci-bin-linux'
-            sh 'make ci-bin-darwin'
-            sh 'make ci-bin-windows'
-            archiveArtifacts '*.tar.gz'
+            try {
+                checkout scm
+                sh 'rm -f *.tar.gz'
+                sh 'docker image prune -f'
+                sh 'make ci-lint'
+                sh 'make ci-test'
+                sh 'make ci-bin-linux'
+                sh 'make ci-bin-darwin'
+                sh 'make ci-bin-windows'
+                archiveArtifacts '*.tar.gz'
+            } finally {
+                def clean_images = /docker image ls --format "{{.ID}}\t{{.Tag}}" | grep $(git describe --always --dirty) | awk '{print $1}' | xargs docker image rm/
+                sh clean_images
+            }
         }
     }
 }

Makefile

@@ -71,17 +71,17 @@ clean:
 
 ci-lint:
 	@echo "Linting..."
-	docker build -t $(IMAGE_NAME)-lint $(IMAGE_BUILD_ARGS) -f Dockerfile.lint . --target=lint-image
-	docker run --rm $(IMAGE_NAME)-lint
+	docker build -t $(IMAGE_NAME)-lint:$(TAG) $(IMAGE_BUILD_ARGS) -f Dockerfile.lint . --target=lint-image
+	docker run --rm $(IMAGE_NAME)-lint:$(TAG)
 
 ci-test:
 	@echo "Testing..."
-	docker build -t $(IMAGE_NAME)-test $(IMAGE_BUILD_ARGS) . --target=test
+	docker build -t $(IMAGE_NAME)-test:$(TAG) $(IMAGE_BUILD_ARGS) . --target=test
 
 ci-bin-%:
 	@echo "Building tarball for $*..."
-	docker build -t $(IMAGE_NAME)-bin-all $(IMAGE_BUILD_ARGS) . --target=bin-build
-	docker run --rm $(IMAGE_NAME)-bin-all tar -cz $(BIN_NAME)-$*$(if $(filter windows, $*),.exe,) -C /go/src/$(PKG_NAME)/_build/$(TAG)/ > $(BIN_NAME)-$*-$(TAG).tar.gz
+	docker build -t $(IMAGE_NAME)-bin-all:$(TAG) $(IMAGE_BUILD_ARGS) . --target=bin-build
+	docker run --rm $(IMAGE_NAME)-bin-all:$(TAG) tar -cz $(BIN_NAME)-$*$(if $(filter windows, $*),.exe,) -C /go/src/$(PKG_NAME)/_build/$(TAG)/ > $(BIN_NAME)-$*-$(TAG).tar.gz
 
 .PHONY: bin bin-all release test check lint e2e-test unit-test clean ci-lint ci-test
 .DEFAULT: all