From 90ad8bc32b5e29dfdf926bed86f41adfbe7257aa Mon Sep 17 00:00:00 2001
From: vegardrs <vegard.rist.sorheim@gmail.com>
Date: Fri, 5 Jul 2024 12:52:42 +0200
Subject: [PATCH] 	modified:   .github/workflows/apply_on_push.yaml 
 modified:   .github/workflows/build_and_push_images.yaml

---
 .github/workflows/apply_on_push.yaml         | 16 ++++++++--------
 .github/workflows/build_and_push_images.yaml | 11 +++++------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/apply_on_push.yaml b/.github/workflows/apply_on_push.yaml
index b7819f04..83431974 100644
--- a/.github/workflows/apply_on_push.yaml
+++ b/.github/workflows/apply_on_push.yaml
@@ -62,14 +62,14 @@ jobs:
           id: apply
           run: terraform apply -auto-approve
 
-        - name: Log in to ACR
-          run: az acr login --name crimomsw
+        # - name: Log in to ACR
+        #   run: az acr login --name crimomsw
   
-        - name: Build and push Client Docker image
-          run: |
-            pwd && docker buildx build --push --tag crimomsw.azurecr.io/client:${{ github.sha }} ../IMOMaritimeSingleWindow/Client
-        - name: Build and push Server Docker image
-          run: |
-            pwd &&  docker buildx build --push --tag crimomsw.azurecr.io/server:${{ github.sha }} ../IMOMaritimeSingleWindow/Server
+        # - name: Build and push Client Docker image
+        #   run: |
+        #     pwd && docker buildx build --push --tag crimomsw.azurecr.io/client:${{ github.sha }} ../IMOMaritimeSingleWindow/Client
+        # - name: Build and push Server Docker image
+        #   run: |
+        #     pwd &&  docker buildx build --push --tag crimomsw.azurecr.io/server:${{ github.sha }} ../IMOMaritimeSingleWindow/Server
 
   
\ No newline at end of file
diff --git a/.github/workflows/build_and_push_images.yaml b/.github/workflows/build_and_push_images.yaml
index 8a28b6a5..42d0ede5 100644
--- a/.github/workflows/build_and_push_images.yaml
+++ b/.github/workflows/build_and_push_images.yaml
@@ -1,10 +1,9 @@
 name: Build and Push Images
 
 on:
-  workflow_run:
-    workflows: ["Apply On Push Infrastructure Terraform"]
-    types:
-      - completed
+  push:
+    branches: 
+      - deploy-infra-terraformv2
 
 permissions:
   id-token: write
@@ -27,8 +26,8 @@ jobs:
         working-directory: ./terraform
 
     steps:
-      # - name: Checkout
-      #   uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
       
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1