Properly calculate image tag in GitHub Actions

.github/workflows/test-build-deploy.yml

@@ -142,13 +142,13 @@ jobs:
       - name: Integration Tests
         run: |
           export CORTEX_IMAGE_PREFIX="${IMAGE_PREFIX:-quay.io/cortexproject/}"
-          export CORTEX_IMAGE="${CORTEX_IMAGE_PREFIX}cortex:${TAG:-$(./tools/image-tag)}"
+          export IMAGE_TAG=$(make image-tag)
+          export CORTEX_IMAGE="${CORTEX_IMAGE_PREFIX}cortex:$IMAGE_TAG"
           export CORTEX_CHECKOUT_DIR="/go/src/github.com/cortexproject/cortex"
           echo "Running integration tests with image: $CORTEX_IMAGE"
           go test -tags=requires_docker -timeout 1800s -v -count=1 ./integration/...
         env:
           IMAGE_PREFIX: ${{ secrets.IMAGE_PREFIX }}
-          TAG: ${{ github.event.push.tag_name }}
 
   integration-configs-db:
     needs: build
@@ -241,11 +241,11 @@ jobs:
           if [ -n "$QUAY_REGISTRY_PASSWORD" ]; then
             docker login -u "$QUAY_REGISTRY_USER" -p "$QUAY_REGISTRY_PASSWORD" quay.io;
           fi
-          IMAGE_TAG=$GIT_TAG ./push-images $NOQUAY
+          export IMAGE_TAG=$(make image-tag)
+          ./push-images $NOQUAY
         env:
           DOCKER_REGISTRY_USER: ${{secrets.DOCKER_REGISTRY_USER}}
           DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
           QUAY_REGISTRY_USER: ${{secrets.QUAY_REGISTRY_USER}}
           QUAY_REGISTRY_PASSWORD: ${{secrets.QUAY_REGISTRY_PASSWORD}}
-          GIT_TAG: ${{github.event.release.tag_name}}
           NOQUAY: ${{secrets.NOQUAY}}

Makefile

@@ -12,12 +12,26 @@ GOPROXY_VALUE=$(shell go env GOPROXY)
 # Boiler plate for building Docker containers.
 # All this must go at top of file I'm afraid.
 IMAGE_PREFIX ?= quay.io/cortexproject/
-# Use CIRCLE_TAG if present for releases.
-IMAGE_TAG ?= $(if $(CIRCLE_TAG),$(CIRCLE_TAG),$(shell ./tools/image-tag))
+
+# For a tag push GITHUB_REF will look like refs/tags/<tag_name>,
+# If finding refs/tags/ does not equal emptystring then use
+# the tag we are at as the image tag.
+ifneq (,$(findstring refs/tags/, $(GITHUB_REF)))
+	GIT_TAG := $(shell git tag --points-at HEAD)
+endif
+# Keep circle-ci compatability for now.
+ifdef CIRCLE_TAG
+	GIT_TAG := $(CIRCLE_TAG)
+endif
+IMAGE_TAG ?= $(if $(GIT_TAG),$(GIT_TAG),$(shell ./tools/image-tag))
 GIT_REVISION := $(shell git rev-parse --short HEAD)
 GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 UPTODATE := .uptodate
 
+.PHONY: image-tag
+image-tag:
+	@echo $(IMAGE_TAG)
+
 # Support gsed on OSX (installed via brew), falling back to sed. On Linux
 # systems gsed won't be installed, so will use sed as expected.
 SED ?= $(shell which gsed 2>/dev/null || which sed)