diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 708eec1..31148fa 100644 --- 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 index c1ed3f6..9246545 100644 --- 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 @@ -67,15 +67,15 @@ 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 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); \