Re-tag images instead of re-building

Signed-off-by: Jose Fuentes <[email protected]>

Author: j-fuentes

.github/workflows/release-master.yml

@@ -51,5 +51,7 @@ jobs:
         registry: quay.io
         username: ${{ secrets.QUAY_USER }}
         password: ${{ secrets.QUAY_PASSWORD }}
-    - name: Build images
-      run: make push-docker-image-canary
+    - name: Build and push
+      run: make push-docker-image
+    - name: Tag
+      run: make create-docker-image-tag NEW_TAG=canary

.github/workflows/release-tag.yml

@@ -7,24 +7,7 @@ on:
       - v*
 
 jobs:
-  golint:
-    name: vet fmt and lint
-    runs-on: ubuntu-20.04
-    container: golang:1.13.7
-    steps:
-    - uses: actions/[email protected]
-    - name: Install golint
-      run: go get -u golang.org/x/lint/golint
-    - run: make lint
-      shell: bash
-  gotest:
-    name: go test
-    runs-on: ubuntu-20.04
-    container: golang:1.13.7
-    steps:
-    - uses: actions/[email protected]
-    - run: make test
-  docker_build:
+  docker_tag:
     name: docker_build
     runs-on: ubuntu-20.04
     container:
@@ -41,6 +24,8 @@ jobs:
     - name: Install Tools
       run: apk add --update make git jq rsync curl
     - uses: actions/[email protected]
+    - name: Capture tag in env
+      run: echo "TAG_LABEL=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v1
     - name: Set up Docker Buildx
@@ -51,5 +36,7 @@ jobs:
         registry: quay.io
         username: ${{ secrets.QUAY_USER }}
         password: ${{ secrets.QUAY_PASSWORD }}
-    - name: Build images
-      run: make push-docker-image
+    - name: Tag latest
+      run: make create-docker-image-tag NEW_TAG=latest
+    - name: Tag with git tag
+      run: make create-docker-image-tag NEW_TAG=${{ env.TAG_LEVEL }}

Makefile

@@ -10,7 +10,7 @@ GOARCH:=$(shell go env GOARCH)
 BIN_NAME:=preflight
 
 DOCKER_IMAGE?=quay.io/jetstack/preflight
-DOCKER_IMAGE_TAG?=$(DOCKER_IMAGE):$(VERSION)
+DOCKER_IMAGE_TAG?=$(DOCKER_IMAGE):$(COMMIT)
 
 # BUILD_IN decides if the binaries will be built in `docker` or in the `host`.
 BUILD_IN?=docker
@@ -90,7 +90,7 @@ build-all-platforms-in-docker:
 PLATFORMS?=linux/arm/v7,linux/arm64/v8,linux/amd64
 BUILDX_EXTRA_ARGS?=
 
-push_buildx_args=--tag $(DOCKER_IMAGE):latest --push $(BUILDX_EXTRA_ARGS)
+push_buildx_args=--push $(BUILDX_EXTRA_ARGS)
 push-canary_buildx_args=--tag $(DOCKER_IMAGE):canary --push $(BUILDX_EXTRA_ARGS)
 build_buildx_args=$(BUILDX_EXTRA_ARGS)
 
@@ -103,7 +103,10 @@ _docker-%: build-all-platforms
 
 build-docker-image: _docker-build
 push-docker-image: _docker-push
-push-docker-image-canary: _docker-push-canary
+
+NEW_TAG?=latest
+create-docker-image-tag:
+	docker buildx imagetools create $(DOCKER_IMAGE):$(COMMIT) --tag $(DOCKER_IMAGE):$(NEW_TAG)
 
 # CI