Merge branch 'TT-513-Create-CI/CD-pipeline-in-timer-tracker-ui-to-deploy-changes-for-both-environments' of https://github.com/ioet/time-tracker-ui into TT-513-Create-CI/CD-pipeline-in-timer-tracker-ui-to-deploy-changes-for-both-environments

Author: santii90ec

.github/workflows/time-tracker-ui-cd-stage.yml

@@ -30,16 +30,16 @@ jobs:
       run: make build
     - name: Publish docker image to stage azure container registry
       run: |
-        make login publish acr=timetrackerservicestageregistry image_tag=$RELEASE_VERSION
-    - name: Setup terraform
-      uses: hashicorp/setup-terraform@v1
-    - name: Authenticate with the TF modules repository
-      uses: webfactory/[email protected]
-      with:
-        ssh-private-key: ${{ secrets.INFRA_TERRAFORM_MODULES_SSH_PRIV_KEY }}
-    - name: Terraform Init
-      working-directory: ${{ env.WORKING_DIR }}
-      run: terraform init
-    - name: Terraform Apply
-      working-directory: ${{ env.WORKING_DIR }}
-      run: terraform apply -lock=false -var-file="${{ env.TF_WORKSPACE }}.tfvars" -var "image_tag=$RELEASE_VERSION" -auto-approve
+        make login publish acr=TT513registry image_tag=$RELEASE_VERSION
+    # - name: Setup terraform
+    #   uses: hashicorp/setup-terraform@v1
+    # - name: Authenticate with the TF modules repository
+    #   uses: webfactory/[email protected]
+    #   with:
+    #     ssh-private-key: ${{ secrets.INFRA_TERRAFORM_MODULES_SSH_PRIV_KEY }}
+    # - name: Terraform Init
+    #   working-directory: ${{ env.WORKING_DIR }}
+    #   run: terraform init
+    # - name: Terraform Apply
+    #   working-directory: ${{ env.WORKING_DIR }}
+    #   run: terraform apply -lock=false -var-file="${{ env.TF_WORKSPACE }}.tfvars" -var "image_tag=$RELEASE_VERSION" -auto-approve

Makefile

@@ -50,8 +50,8 @@ testdev: ## Run all tests on docker container timetracker_ui at the Dev
 
 .PHONY: publish
 publish: ## Publish the container image timetracker_ui.
-	docker tag timetracker_ui:latest $(registry_url)/timetracker_ui:latest
-	docker push $(registry_url)/timetracker_ui:latest
+	docker tag timetracker_ui:latest $(acr).azurecr.io/timetracker_ui:latest
+	docker push $(acr)/timetracker_ui:latest
 
 .PHONY: build_prod
 build_prod: ## Create docker image with dependencies needed for production.
@@ -68,9 +68,9 @@ remove_prod: ## Delete container timetracker_ui_pro.
 
 .PHONY: publish_prod
 publish_prod: ## Publish the container image timetracker_ui_prod.
-	docker tag timetracker_ui_prod:latest $(registry_url)/timetracker_ui_prod:latest
-	docker push $(registry_url)/timetracker_ui_prod:latest
+	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 $(container_registry)
+	az acr login --name $(acr)