bugfix: updated version upgrade notice (#193)

* bugfix: updated version upgrade notice * updated after discussions * removed extra whitespace
armory-io · Sep 19, 2023 · a43a483 · a43a483
1 parent e6b6ad1
commit a43a483
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -248,7 +248,8 @@ jobs:
       - name: Build and push Docker image
         env:
           REGISTRY: docker.io
-          VERSION: ${{ steps.vars.outputs.version }}
+          VERSION: ${{ needs.setup.outputs.version }}
+          IMAGE_TAG_VERSION: ${{ steps.vars.outputs.version }}
           IMAGE_TAG: latest
           PUSH: true
         run: make release

diff --git a/Makefile b/Makefile
@@ -1,6 +1,7 @@
 APP_NAME              = armory
 APP_EXT               ?= "${CLI_EXT}"
-VERSION               ?= $(shell ./scripts/version.sh | cut -c -30) #limit the version to 30 characters - 
+VERSION               ?= $(shell ./scripts/version.sh | cut -c -30)#limit the version to 30 characters -
+IMAGE_TAG_VERSION	  ?= "$(VERSION)"
 REGISTRY              ?= armory-docker-local.jfrog.io
 REGISTRY_ORG          ?= armory
 GOARCH                ?= $(shell go env GOARCH)
@@ -49,7 +50,7 @@ ifdef PUSH
 endif
 	@docker build \
 	--tag $(IMAGE):$(IMAGE_TAG) \
-	--tag $(IMAGE):$(VERSION) \
+	--tag $(IMAGE):$(IMAGE_TAG_VERSION) \
 	--label "org.opencontainers.image.created=$(TIMESTAMP)" \
 	--label "org.opencontainers.image.description=The CLI for Armory Continuous Deployments-as-a-Service" \
 	--label "org.opencontainers.image.revision=$(GITHUB_SHA)" \