Refactoring makefile pipeline for building container image

Makefile

@@ -91,31 +91,31 @@ build-tf-infra:
 	@echo " Task      : Create Container Image Terraform "
 	@echo " Date/Time : `date` "
 	@echo "=========================================================="
-	@cd ${PATH_DOCKER} && ./ecr-build.sh $(ARGS) alpine Dockerfile.alpine alpine-${ALPINE_VERSION} $(CI_PATH)
+	@cd ${PATH_DOCKER} && ./ecr-build.sh $(ARGS) alpine Dockerfile.alpine ${ALPINE_VERSION} $(CI_PATH)
 	@echo '- DONE -'
 
 build-tf-alpine:
 	@echo "=========================================================="
 	@echo " Task      : Create Container Image Terraform Alpine "
 	@echo " Date/Time : `date` "
 	@echo "=========================================================="
-	@cd ${PATH_DOCKER} && ./ecr-build.sh $(ARGS) alpine Dockerfile.alpine alpine-${ALPINE_VERSION} $(CI_PATH)
+	@cd ${PATH_DOCKER} && ./ecr-build.sh $(ARGS) alpine Dockerfile.alpine ${ALPINE_VERSION} $(CI_PATH)
 	@echo '- DONE -'
 
 build-tf-ubuntu:
 	@echo "=========================================================="
 	@echo " Task      : Create Container Image Terraform Ubuntu "
 	@echo " Date/Time : `date` "
 	@echo "=========================================================="
-	@cd ${PATH_DOCKER} && ./ecr-build.sh $(ARGS) ubuntu Dockerfile.ubuntu ubuntu-${UBUNTU_VERSION} $(CI_PATH)
+	@cd ${PATH_DOCKER} && ./ecr-build.sh $(ARGS) ubuntu Dockerfile.ubuntu ${UBUNTU_VERSION} $(CI_PATH)
 	@echo '- DONE -'
 
 build-tf-codebuild:
 	@echo "=========================================================="
 	@echo " Task      : Create Container Image Terraform CodeBuild "
 	@echo " Date/Time : `date` "
 	@echo "=========================================================="
-	@cd ${PATH_DOCKER} && ./ecr-build.sh $(ARGS) codebuild Dockerfile.codebuild codebuild-${CODEBUILD_VERSION} $(CI_PATH)
+	@cd ${PATH_DOCKER} && ./ecr-build.sh $(ARGS) codebuild Dockerfile.codebuild ${CODEBUILD_VERSION} $(CI_PATH)
 	@echo '- DONE -'
 
 # ============================ #

dockerhub-build.sh

@@ -34,9 +34,9 @@ docker_build() {
 }
 
 main() {
-  # docker_build alpine Dockerfile.alpine devopscorner/terraform-infra
-  # docker_build ubuntu Dockerfile.ubuntu devopscorner/terraform-infra
-  # docker_build codebuild Dockerfile.codebuild devopscorner/terraform-infra
+  # docker_build alpine Dockerfile.alpine 3.16 devopscorner/terraform-infra
+  # docker_build ubuntu Dockerfile.ubuntu 22.04 devopscorner/terraform-infra
+  # docker_build codebuild Dockerfile.codebuild 4.0 devopscorner/terraform-infra
   docker_build $1 $2 $3 $4
   echo ''
   echo '-- ALL DONE --'