From 7bbb67d52335e22d50f93802393f56b08ae04d0e Mon Sep 17 00:00:00 2001
From: Abhisek Dwivedi <adwivedi@aerospike.com>
Date: Wed, 13 Mar 2024 21:45:02 +0530
Subject: [PATCH] Revert latest tag changes

---
 Makefile         |  5 ++---
 scripts/build.sh | 10 +++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 38933c2..0a49c22 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,6 @@ PLATFORMS ?= linux/amd64,linux/arm64
 VERSION ?= 2.1.0
 # Image URL to use all building/pushing aerospike-kubernetes-init image targets
 IMG ?= aerospike/aerospike-kubernetes-init-nightly:${VERSION}
-EXTRA_TAG ?= ${IMG}
 
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
@@ -74,14 +73,14 @@ run: fmt vet ## Run a akoinit from your host.
 docker-buildx-build: ## Build docker image for the init container for cross-platform support
 	- docker buildx create --name project-v3-builder
 	docker buildx use project-v3-builder
-	docker buildx build --load --no-cache --provenance=false --tag ${IMG} --tag ${EXTRA_TAG} --build-arg VERSION=$(VERSION) .
+	docker buildx build --load --no-cache --provenance=false --tag ${IMG} --build-arg VERSION=$(VERSION) .
 	- docker buildx rm project-v3-builder
 
 .PHONY: docker-buildx-build-push
 docker-buildx-build-push: ## Build and push docker image for the init container for cross-platform support
 	- docker buildx create --name project-v3-builder
 	docker buildx use project-v3-builder
-	docker buildx build --push --no-cache --provenance=false --platform=$(PLATFORMS) --tag ${IMG} --tag ${EXTRA_TAG} --build-arg VERSION=$(VERSION) .
+	docker buildx build --push --no-cache --provenance=false --platform=$(PLATFORMS) --tag ${IMG} --build-arg VERSION=$(VERSION) .
 	- docker buildx rm project-v3-builder
 
 .PHONY: docker-buildx-build-push-openshift
diff --git a/scripts/build.sh b/scripts/build.sh
index 9f3b229..f4d26de 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -14,12 +14,12 @@ if [ "$REF_TYPE" != 'tag' ]; then
 fi
 
 # Push docker image to dockerhub
-make docker-buildx-build-push IMG="$IMG_BASE":"$TAG" EXTRA_TAG="$IMG_BASE":latest
+make docker-buildx-build-push IMG="$IMG_BASE":"$TAG"
 
 # Push docker image to ECR for testing
-ECR_IMG_BASE="$AWS_ECR"/"$IMG_BASE"
-make docker-buildx-build-push IMG="$ECR_IMG_BASE":"$TAG" EXTRA_TAG="$ECR_IMG_BASE":latest
+ECR_IMG="$AWS_ECR"/"$IMG_BASE":"$TAG"
+make docker-buildx-build-push IMG="$ECR_IMG"
 
 # Push docker image to Quay with non-root user
-QUAY_IMG_BASE=quay.io/"$IMG_BASE"
-make docker-buildx-build-push-openshift IMG="$QUAY_IMG_BASE":"$TAG" EXTRA_TAG="$QUAY_IMG_BASE":latest
+QUAY_IMG=quay.io/"$IMG_BASE":"$TAG"
+make docker-buildx-build-push-openshift IMG="$QUAY_IMG"