fix: TT-513 Merge with master

Author: santii90ec

Makefile

@@ -49,9 +49,9 @@ testdev: ## Run all tests on docker container timetracker_ui at the Dev
 	docker exec timetracker_ui bash -c "npm run ci-test"
 
 .PHONY: publish
-publish: require-acr-arg require-image_tag-arg ## Upload a docker image to an azure container registry acr=<name_of_the_azure_container_registry> image_tag=<tag_for_the_image>
-	docker tag timetracker_api $(acr).azurecr.io/timetracker_api:$(image_tag)
-	docker push $(acr).azurecr.io/timetracker_api:$(image_tag)
+publish: require-acr-arg require-image_tag-arg ## Upload a docker image to the stage azure container registry acr=<name_of_the_azure_container_registry> image_tag=<tag_for_the_image>
+	docker tag timetracker_ui:latest $(acr).azurecr.io/timetracker_ui:$(image_tag)
+	docker push $(acr).azurecr.io/timetracker_ui:$(image_tag)
 
 .PHONY: build_prod
 build_prod: ## Create docker image with dependencies needed for production.
@@ -61,16 +61,47 @@ build_prod: ## Create docker image with dependencies needed for production.
 run_prod: ## Execute timetracker_ui_prod docker container.
 	docker run -d -p 4200:4200 --name timetracker_ui_prod timetracker_ui_prod
 
+.PHONY: stop_prod
+stop_prod: ## Stop container timetracker_ui_prod.
+	docker stop timetracker_ui_prod
+
 .PHONY: remove_prod
-remove_prod: ## Delete container timetracker_ui_pro.
+remove_prod: ## Delete container timetracker_ui_prod.
 	docker stop timetracker_ui_prod
 	docker rm timetracker_ui_prod
 
 .PHONY: publish_prod
+<<<<<<< HEAD
 publish_prod: ## Publish the container image timetracker_ui_prod.
 	docker tag timetracker_ui_prod:$(image_tag) $(registry_url)/timetracker_ui_prod:$(image_tag)
 	docker push $(registry_url)/timetracker_ui_prod:$(image_tag)
 
 .PHONY: login
 login: ## Login in respository of docker images.
 	az acr login --name $(acr)
+=======
+publish_prod: require-acr-arg require-image_tag-arg ## Upload a docker image to the prod azure container registry acr=<name_of_the_azure_container_registry> image_tag=<tag_for_the_image>
+	docker tag timetracker_ui_prod:latest $(acr).azurecr.io/timetracker_ui:$(image_tag)
+	docker push $(acr).azurecr.io/timetracker_ui:$(image_tag)
+
+.PHONY: login
+login: ## Login in respository of docker images.
+	az acr login --name $(container_registry)
+
+.PHONY: release
+release: require-VERSION-arg require-COMMENT-arg ## Creates an pushes a new tag.
+	git tag -a ${VERSION} -m "${COMMENT}"
+	git push origin ${VERSION}
+
+require-%-arg:
+	@if [ -z ${${*}} ]; then \
+          echo "ERROR: [$*] argument is required, e.g. $*=<value>"; \
+          exit 1; \
+        fi
+
+require-%-tool:
+	@if [ "$(shell command -v ${*} 2> /dev/null)" = "" ]; then \
+          echo "ERROR: [$*] not found"; \
+          exit 1; \
+        fi
+>>>>>>> master

infrastructure/main.tf

@@ -32,34 +32,26 @@ data "terraform_remote_state" "service" {
   }
 }
 
-data "azurerm_container_registry" "registry" {
-  name                = data.terraform_remote_state.service.outputs.container_registry_name
-  resource_group_name = data.terraform_remote_state.service.outputs.resource_group_name
-}
-
-data "azurerm_resource_group" "root" {
-  name = data.terraform_remote_state.service.outputs.resource_group_name
-}
-
 locals {
   common_name             = "time-tracker-ui"
   environment             = terraform.workspace
   service_name            = "${local.common_name}-${local.environment}"
   create_app_service_plan = true
   service_plan_kind       = "Linux"
+  image_name       = "timetracker_ui"
 }
 
 module "ui" {
   source                   = "[email protected]:ioet/infra-terraform-modules.git//azure-app-service?ref=tags/v0.0.5"
   app_service_name         = local.service_name
   create_app_service_plan  = local.create_app_service_plan
-  docker_image_name        = var.docker_image_name
-  docker_image_namespace   = data.azurerm_container_registry.registry.login_server
-  docker_registry_password = data.azurerm_container_registry.registry.admin_password
-  docker_registry_url      = data.azurerm_container_registry.registry.login_server
-  docker_registry_username = data.azurerm_container_registry.registry.admin_username
-  location                 = data.azurerm_resource_group.root.location
-  resource_group_name      = data.azurerm_resource_group.root.name
+  docker_image_name        = "${local.image_name}:${var.image_tag}"
+  docker_image_namespace   = data.terraform_remote_state.service.outputs.container_registry_login_server
+  docker_registry_password = data.terraform_remote_state.service.outputs.container_registry_admin_password
+  docker_registry_url      = data.terraform_remote_state.service.outputs.container_registry_login_server
+  docker_registry_username = data.terraform_remote_state.service.outputs.container_registry_admin_username
+  location                 = data.terraform_remote_state.service.outputs.container_registry_location
+  resource_group_name      = data.terraform_remote_state.service.outputs.resource_group_name
   service_plan_kind        = local.service_plan_kind
   service_plan_name        = local.service_name
   service_plan_size        = var.service_plan_size

infrastructure/variables.tf

@@ -1,6 +1,6 @@
-variable "docker_image_name" {
+variable "image_tag" {
   type        = string
-  description = "Specifies the docker image name that is stored in a private container registry like ACR (Azure Container Registry)."
+  description = "Specifies the docker image tag that is stored in a private container registry like ACR (Azure Container Registry)."
   sensitive   = true
 }