Merge pull request #1551 from cortexproject/release-0.1

Set IMAGE_TAG to CIRCLE_TAG in Makefile
cortexproject · Aug 1, 2019 · c4e7d8e · c4e7d8e
2 parents 5907d38 + a4036a5
commit c4e7d8e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -95,9 +95,6 @@ jobs:
         name: Build
         command: |
           touch build-image/.uptodate
-          if [ -n "$CIRCLE_TAG" ]; then
-            export IMAGE_TAG=$CIRCLE_TAG
-          fi
           make BUILD_IN_CONTAINER=false
 
     - store_artifacts:

diff --git a/Makefile b/Makefile
@@ -4,7 +4,8 @@
 # Boiler plate for bulding Docker containers.
 # All this must go at top of file I'm afraid.
 IMAGE_PREFIX ?= quay.io/cortexproject/
-IMAGE_TAG ?= $(shell ./tools/image-tag)
+# Use CIRCLE_TAG if present for releases.
+IMAGE_TAG ?= $(if $(CIRCLE_TAG),$(CIRCLE_TAG),$(shell ./tools/image-tag))
 GIT_REVISION := $(shell git rev-parse HEAD)
 UPTODATE := .uptodate