Fix tagging issue

stolostron · May 14, 2020 · b26702e · b26702e
1 parent 7bac600
commit b26702e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -127,10 +127,11 @@ container-push: container
 	docker push $(DOCKER_REPO):latest
 
 .PHONY: container-release
+container-release: VERSION_TAG = $(strip $(shell [ -d .git ] && git tag --points-at HEAD))
 container-release: container
 	# https://git-scm.com/docs/git-tag#Documentation/git-tag.txt---points-atltobjectgt
-	@docker tag $(DOCKER_REPO):$(VCS_BRANCH)-$(BUILD_DATE)-$(VERSION) $(DOCKER_REPO):$(VERSION)
-	docker push $(DOCKER_REPO):$(strip $(shell [ -d .git ] && git tag --points-at HEAD))
+	@docker tag $(DOCKER_REPO):$(VCS_BRANCH)-$(BUILD_DATE)-$(VERSION) $(DOCKER_REPO):$(VERSION_TAG)
+	docker push $(DOCKER_REPO):$(VERSION_TAG)
 	docker push $(DOCKER_REPO):latest
 
 .PHONY: integration-test-dependencies