fix image tag in helm chart

neuro-inc · Nov 11, 2021 · c75f448 · c75f448
1 parent 22eaab2
commit c75f448
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -75,7 +75,7 @@ jobs:
       run: make helm_create_chart
       env:
         IMAGE_REGISTRY: github
-        TAG: ${{ needs.publish_image.outputs.tag }}
+        IMAGE_TAG: ${{ needs.publish_image.outputs.version }}
         GITHUB_OWNER: ${{ github.repository_owner }}
         HELM_CHART_VERSION: ${{ needs.publish_image.outputs.version }}
         HELM_APP_VERSION: ${{ needs.publish_image.outputs.version }}

diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ AZURE_ACR_NAME ?= crc570d91c95c6aac0ea80afb1019a0c6f
 
 GITHUB_OWNER ?= neuro-inc
 
-TAG ?= latest
+IMAGE_TAG ?= latest
 
 IMAGE_REPO_gke    = $(GKE_DOCKER_REGISTRY)/$(GKE_PROJECT_ID)
 IMAGE_REPO_aws    = $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com
@@ -68,8 +68,8 @@ docker_build:
 		-t $(IMAGE_NAME):latest .
 
 docker_push: docker_build
-	docker tag $(IMAGE_NAME):latest $(IMAGE_REPO):$(TAG)
-	docker push $(IMAGE_REPO):$(TAG)
+	docker tag $(IMAGE_NAME):latest $(IMAGE_REPO):$(IMAGE_TAG)
+	docker push $(IMAGE_REPO):$(IMAGE_TAG)
 
 	docker tag $(IMAGE_NAME):latest $(IMAGE_REPO):latest
 	docker push $(IMAGE_REPO):latest
@@ -94,7 +94,7 @@ azure_k8s_login:
 
 helm_create_chart:
 	export IMAGE_REPO=$(IMAGE_REPO); \
-	export IMAGE_TAG=$(TAG); \
+	export IMAGE_TAG=$(IMAGE_TAG); \
 	export CHART_VERSION=$(HELM_CHART_VERSION); \
 	export APP_VERSION=$(HELM_APP_VERSION); \
 	VALUES=$$(cat charts/$(HELM_CHART)/values.yaml | envsubst); \