Ensure image version consistency (#426)

Author: riya-kaushal7997

Makefile

@@ -20,18 +20,6 @@
 all: clean build
 
 # Tag parameters
-ifndef MAJOR
-    MAJOR=2
-endif
-ifndef MINOR
-    MINOR=13
-endif
-ifndef PATCH
-    PATCH=0
-endif
-ifndef NOTES
-	NOTES=
-endif
 ifndef TAGMSG
     TAGMSG="CSI Spec 1.6"
 endif
@@ -51,18 +39,18 @@ install:
 
 # Tags the release with the Tag parameters set above
 tag:
-	-git tag -d v$(MAJOR).$(MINOR).$(PATCH)$(NOTES)
-	git tag -a -m $(TAGMSG) v$(MAJOR).$(MINOR).$(PATCH)$(NOTES)
+	go run core/semver/semver.go -f mk >semver.mk
+	make -f docker.mk tag TAGMSG='$(TAGMSG)'
 
 # Generates the docker container (but does not push)
 docker:
 	go run core/semver/semver.go -f mk >semver.mk
-	make -f docker.mk DOCKER_FILE=Dockerfile docker
+	make -f docker.mk docker
 
 # Same as `docker` but without cached layers and will pull latest version of base image
 docker-no-cache:
 	go run core/semver/semver.go -f mk >semver.mk
-	make -f docker.mk DOCKER_FILE=Dockerfile docker-no-cache
+	make -f docker.mk docker-no-cache
 
 # Pushes container to the repository
 push:	docker

docker.mk

@@ -25,6 +25,10 @@ else
 	RELNOTE=
 endif
 
+ifeq ($(IMAGETAG),)
+IMAGETAG=v$(MAJOR).$(MINOR).$(PATCH)$(RELNOTE)
+endif
+
 ifndef DOCKER_REGISTRY
 	DOCKER_REGISTRY=dellemc
 endif
@@ -45,19 +49,18 @@ endif
 
 docker: download-csm-common
 	$(eval include csm-common.mk)
-	@echo "MAJOR $(MAJOR) MINOR $(MINOR) PATCH $(PATCH) RELNOTE $(RELNOTE) SEMVER $(SEMVER)"
-	@echo "$(DOCKER_FILE)"
-	$(BUILDER) build --pull -f $(DOCKER_FILE) -t "$(DOCKER_REGISTRY)/$(DOCKER_IMAGE_NAME):v$(MAJOR).$(MINOR).$(PATCH)$(RELNOTE)" --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) --build-arg BASEIMAGE=$(CSM_BASEIMAGE) .
+	$(BUILDER) build --pull -t "$(DOCKER_REGISTRY)/$(DOCKER_IMAGE_NAME):$(IMAGETAG)" --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) --build-arg BASEIMAGE=$(CSM_BASEIMAGE) .
 
 docker-no-cache: download-csm-common
 	$(eval include csm-common.mk)
-	@echo "MAJOR $(MAJOR) MINOR $(MINOR) PATCH $(PATCH) RELNOTE $(RELNOTE) SEMVER $(SEMVER)"
-	@echo "$(DOCKER_FILE) --no-cache"
-	$(BUILDER) build --pull --no-cache -f $(DOCKER_FILE) -t "$(DOCKER_REGISTRY)/$(DOCKER_IMAGE_NAME):v$(MAJOR).$(MINOR).$(PATCH)$(RELNOTE)" --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) --build-arg BASEIMAGE=$(CSM_BASEIMAGE) .
+	$(BUILDER) build --pull --no-cache -t "$(DOCKER_REGISTRY)/$(DOCKER_IMAGE_NAME):$(IMAGETAG)" --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) --build-arg BASEIMAGE=$(CSM_BASEIMAGE) .
 
 push:
-	echo "MAJOR $(MAJOR) MINOR $(MINOR) PATCH $(PATCH) RELNOTE $(RELNOTE) SEMVER $(SEMVER)"
-	$(BUILDER) push "$(DOCKER_REGISTRY)/$(DOCKER_IMAGE_NAME):v$(MAJOR).$(MINOR).$(PATCH)$(RELNOTE)"
+	$(BUILDER) push "$(DOCKER_REGISTRY)/$(DOCKER_IMAGE_NAME):$(IMAGETAG)"
 
 download-csm-common:
 	curl -O -L https://raw.githubusercontent.com/dell/csm/main/config/csm-common.mk
+
+tag:
+	-git tag -d $(IMAGETAG)
+	git tag -a -m $(TAGMSG) $(IMAGETAG)