Fix missing image bug.

backend/Makefile

@@ -2,14 +2,10 @@
 -include ../helm-cmd.mk
 HELM_CMD ?= helm upgrade --install
 
-ifndef COMMIT
-COMMIT := ${COMMIT_OVERRIDE}
-ifndef COMMIT
-COMMIT := $(shell git rev-parse --short=7 HEAD)
-endif
-endif
+CURRENT_COMMIT := $(shell git rev-parse --short=7 HEAD)
+
 ARO_HCP_BASE_IMAGE ?= ${ARO_HCP_IMAGE_ACR}.azurecr.io
-ARO_HCP_BACKEND_IMAGE ?= $(ARO_HCP_BASE_IMAGE)/arohcpbackend:$(COMMIT)
+ARO_HCP_BACKEND_IMAGE ?= $(ARO_HCP_BASE_IMAGE)/arohcpbackend
 
 .DEFAULT_GOAL := backend
 
@@ -31,16 +27,17 @@ clean:
 
 image:
 	pushd .. && git archive --output backend/archive.tar.gz HEAD && popd
-	docker build -f "./Dockerfile" -t ${ARO_HCP_BACKEND_IMAGE} .
+	docker build -f "./Dockerfile" -t ${ARO_HCP_BACKEND_IMAGE}:${CURRENT_COMMIT} .
 	rm -f archive.tar.gz
 .PHONY: image
 
 push: image
 	az acr login --name ${ARO_HCP_IMAGE_ACR}
-	docker push ${ARO_HCP_BACKEND_IMAGE}
+	docker push ${ARO_HCP_BACKEND_IMAGE}:${CURRENT_COMMIT}
 .PHONY: push
 
 deploy:
+	IMAGE_TAG=$$(../get-tag.sh ${ARO_HCP_IMAGE_ACR} arohcpbackend) \
 	BACKEND_MI_CLIENT_ID=$$(az identity show \
 			-g ${RESOURCEGROUP} \
 			-n backend \
@@ -54,9 +51,9 @@ deploy:
 		--set configMap.databaseUrl="$${DB_URL}" \
 		--set configMap.backendMiClientId="$${BACKEND_MI_CLIENT_ID}" \
 		--set serviceAccount.workloadIdentityClientId="$${BACKEND_MI_CLIENT_ID}" \
-		--set configMap.currentVersion=${ARO_HCP_BACKEND_IMAGE} \
+		--set configMap.currentVersion=${ARO_HCP_BACKEND_IMAGE}:$${IMAGE_TAG} \
 		--set configMap.location=${LOCATION} \
-		--set deployment.imageName=${ARO_HCP_BACKEND_IMAGE} \
+		--set deployment.imageName=${ARO_HCP_BACKEND_IMAGE}:$${IMAGE_TAG} \
 		--namespace aro-hcp
 .PHONY: deploy
 

frontend/Makefile

@@ -2,15 +2,10 @@
 -include ../helm-cmd.mk
 HELM_CMD ?= helm upgrade --install
 
-ifndef COMMIT
-COMMIT := ${COMMIT_OVERRIDE}
-ifndef COMMIT
-COMMIT := $(shell git rev-parse --short=7 HEAD)
-endif
-endif
+CURRENT_COMMIT := $(shell git rev-parse --short=7 HEAD)
 ARO_HCP_IMAGE_REGISTRY ?= ${ARO_HCP_IMAGE_ACR}.azurecr.io
 ARO_HCP_IMAGE_REPOSITORY ?= arohcpfrontend
-ARO_HCP_FRONTEND_IMAGE ?= $(ARO_HCP_IMAGE_REGISTRY)/$(ARO_HCP_IMAGE_REPOSITORY):$(COMMIT)
+ARO_HCP_FRONTEND_IMAGE ?= $(ARO_HCP_IMAGE_REGISTRY)/$(ARO_HCP_IMAGE_REPOSITORY)
 
 .DEFAULT_GOAL := frontend
 
@@ -37,15 +32,16 @@ build-push: image push
 
 image:
 	pushd .. && git archive --output frontend/archive.tar.gz HEAD && popd
-	docker build -f "./Dockerfile" -t ${ARO_HCP_FRONTEND_IMAGE} .
+	docker build -f "./Dockerfile" -t ${ARO_HCP_FRONTEND_IMAGE}:${CURRENT_COMMIT} .
 	rm -f archive.tar.gz
 .PHONY: image
 
 push: image
 	az acr login --name ${ARO_HCP_IMAGE_ACR}
-	docker push ${ARO_HCP_FRONTEND_IMAGE}
+	docker push ${ARO_HCP_FRONTEND_IMAGE}:${CURRENT_COMMIT}
 
 deploy:
+	IMAGE_TAG=$$(../get-tag.sh ${ARO_HCP_IMAGE_ACR} arohcpfrontend) \
 	FRONTEND_MI_CLIENT_ID=$$(az identity show \
 			-g ${RESOURCEGROUP} \
 			-n frontend \
@@ -83,9 +79,9 @@ deploy:
 		--set serviceAccount.workloadIdentityTenantId="$${FRONTEND_MI_TENANT_ID}" \
 		--set pullBinding.workloadIdentityClientId="$${IMAGE_PULLER_MI_CLIENT_ID}" \
 		--set pullBinding.workloadIdentityTenantId="$${IMAGE_PULLER_MI_TENANT_ID}" \
-		--set configMap.currentVersion=${ARO_HCP_FRONTEND_IMAGE} \
+		--set configMap.currentVersion=${ARO_HCP_FRONTEND_IMAGE}:$${IMAGE_TAG} \
 		--set configMap.location=${LOCATION}  \
-		--set deployment.imageName=${ARO_HCP_FRONTEND_IMAGE} \
+		--set deployment.imageName=${ARO_HCP_FRONTEND_IMAGE}:$${IMAGE_TAG} \
 		--set pullBinding.registry=${ARO_HCP_IMAGE_REGISTRY} \
 		--set pullBinding.scope=repository:${ARO_HCP_IMAGE_REPOSITORY}:pull \
 		--set clusterService.namespace=${CS_NAMESPACE} \

get-tag.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+set -x 
+if [ "$#" -ne 2 ]
+then
+    echo "Need ARO_HCP_IMAGE_ACR and REPOSITORY parameters"
+    exit 1
+fi
+
+aro_hcp_image_acr=${1}
+repository=${2}
+
+if [ -n "${COMMIT_OVERRIDE}" ];
+then
+    echo ${COMMIT_OVERRIDE}
+    exit 0
+fi
+
+if [ -n "${COMMIT}" ];
+then
+    echo ${COMMIT}
+    exit 0
+fi
+
+
+tags=$(mktemp)
+trap "rm ${tags}" EXIT
+
+az acr repository show-tags --orderby time_desc --n ${aro_hcp_image_acr} --repository ${repository} > $tags
+
+suggested_tag=$(grep $(git rev-parse --short=7 HEAD) $tags |cut -d '"' -f2)
+if [ -n "${suggested_tag}" ];
+then
+    echo ${suggested_tag}
+    exit 0
+fi
+
+grep '"' $tags | head -1 | cut -d '"' -f2