From 9eae22b71d94ec584487b15c33900bb47a35476a Mon Sep 17 00:00:00 2001
From: Prajwal-Microsoft <v-dcprajwal@microsoft.com>
Date: Fri, 15 Nov 2024 17:07:31 +0530
Subject: [PATCH 1/7] Update app.py

---
 app.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app.py b/app.py
index 64ad55d82..d9687e676 100644
--- a/app.py
+++ b/app.py
@@ -42,6 +42,7 @@ def create_app():
     app = Quart(__name__)
     app.register_blueprint(bp)
     app.config["TEMPLATES_AUTO_RELOAD"] = True
+    app.config['PROVIDE_AUTOMATIC_OPTIONS'] = True
     return app
 
 

From 448bac6652c6deaee87f35f18039ddb0fa5e7f9a Mon Sep 17 00:00:00 2001
From: Ajit Padhi <v-padhiajit@microsoft.com>
Date: Tue, 10 Dec 2024 12:49:47 +0530
Subject: [PATCH 2/7] added separate image tag based on branch

---
 .github/workflows/docker-build-and-push.yml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml
index 38102f59e..32445e1d5 100644
--- a/.github/workflows/docker-build-and-push.yml
+++ b/.github/workflows/docker-build-and-push.yml
@@ -5,6 +5,8 @@ on:
     types: [closed]
     branches:
       - main
+      - dev
+      - demo
   workflow_dispatch: # Add this line to enable manual triggering
 
 jobs:
@@ -26,7 +28,18 @@ jobs:
           username: ${{ secrets.ACR_USERNAME }}
           password: ${{ secrets.ACR_PASSWORD }}
 
+      - name: Set Docker image tag
+        id: docker_tag
+        run: |
+          if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
+            echo "TAG=latest" >> $GITHUB_ENV
+          elif [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
+            echo "TAG=dev" >> $GITHUB_ENV
+          elif [[ "${{ github.ref }}" == "refs/heads/demo" ]]; then
+            echo "TAG=demo" >> $GITHUB_ENV
+          fi
+
       - name: Build and push Docker image
         run: |
-          docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/webapp:latest -f WebApp.Dockerfile .
-          docker push ${{ secrets.ACR_LOGIN_SERVER }}/webapp:latest
\ No newline at end of file
+          docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/webapp:${{ env.TAG }} -f WebApp.Dockerfile .
+          docker push ${{ secrets.ACR_LOGIN_SERVER }}/webapp:${{ env.TAG }}
\ No newline at end of file

From c8229811031b12df5191119e57db3f313f4a4ce2 Mon Sep 17 00:00:00 2001
From: Ajit Padhi <v-padhiajit@microsoft.com>
Date: Wed, 11 Dec 2024 14:02:10 +0530
Subject: [PATCH 3/7] fixed registry issue

---
 .github/workflows/docker-build-and-push.yml | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml
index 32445e1d5..8d422a5f3 100644
--- a/.github/workflows/docker-build-and-push.yml
+++ b/.github/workflows/docker-build-and-push.yml
@@ -7,6 +7,7 @@ on:
       - main
       - dev
       - demo
+      - dev-test
   workflow_dispatch: # Add this line to enable manual triggering
 
 jobs:
@@ -22,15 +23,25 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Log in to Azure Container Registry
-        uses: azure/docker-login@v1
+        if: ${{ github.ref_name == 'main' }}
+        uses: azure/docker-login@v2
         with:
           login-server: ${{ secrets.ACR_LOGIN_SERVER }}
           username: ${{ secrets.ACR_USERNAME }}
           password: ${{ secrets.ACR_PASSWORD }}
 
+      - name: Log in to Azure Container Registry
+        if: ${{ github.ref_name == 'dev' || github.ref_name == 'demo' }}
+        uses: azure/docker-login@v2
+        with:
+          login-server: ${{ secrets.ACR_DEV_LOGIN_SERVER }}
+          username: ${{ secrets.ACR_DEV_USERNAME }}
+          password: ${{ secrets.ACR_DEV_PASSWORD }}
+
       - name: Set Docker image tag
         id: docker_tag
         run: |
+          echo "server... ${{secrets.ACR_LOGIN_SERVER}}"
           if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
             echo "TAG=latest" >> $GITHUB_ENV
           elif [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
@@ -40,6 +51,13 @@ jobs:
           fi
 
       - name: Build and push Docker image
+        if: ${{ github.ref_name == 'main' }}
+        run: |
+          docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/webapp:${{ env.TAG }} -f WebApp.Dockerfile .
+          docker push ${{ secrets.ACR_LOGIN_SERVER }}/webapp:${{ env.TAG }}
+
+      - name: Build and push Docker image
+        if: ${{ github.ref_name == 'dev' || github.ref_name == 'demo' }}
         run: |
           docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/webapp:${{ env.TAG }} -f WebApp.Dockerfile .
           docker push ${{ secrets.ACR_LOGIN_SERVER }}/webapp:${{ env.TAG }}
\ No newline at end of file

From dfeba4b2ff739b8b4c447fae1faae1cd32bacda7 Mon Sep 17 00:00:00 2001
From: Ajit Padhi <v-padhiajit@microsoft.com>
Date: Wed, 11 Dec 2024 14:02:55 +0530
Subject: [PATCH 4/7] fixed registry issue

---
 .github/workflows/docker-build-and-push.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml
index 8d422a5f3..f635e938a 100644
--- a/.github/workflows/docker-build-and-push.yml
+++ b/.github/workflows/docker-build-and-push.yml
@@ -41,7 +41,6 @@ jobs:
       - name: Set Docker image tag
         id: docker_tag
         run: |
-          echo "server... ${{secrets.ACR_LOGIN_SERVER}}"
           if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
             echo "TAG=latest" >> $GITHUB_ENV
           elif [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then

From 78fa84d66aa8175f1cac8c0d4b1a4b76593840bb Mon Sep 17 00:00:00 2001
From: Ajit Padhi <v-padhiajit@microsoft.com>
Date: Wed, 11 Dec 2024 14:05:09 +0530
Subject: [PATCH 5/7] fixed registry issue

---
 .github/workflows/docker-build-and-push.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml
index f635e938a..c737f6a61 100644
--- a/.github/workflows/docker-build-and-push.yml
+++ b/.github/workflows/docker-build-and-push.yml
@@ -58,5 +58,5 @@ jobs:
       - name: Build and push Docker image
         if: ${{ github.ref_name == 'dev' || github.ref_name == 'demo' }}
         run: |
-          docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/webapp:${{ env.TAG }} -f WebApp.Dockerfile .
-          docker push ${{ secrets.ACR_LOGIN_SERVER }}/webapp:${{ env.TAG }}
\ No newline at end of file
+          docker build -t ${{ secrets.ACR_DEV_LOGIN_SERVER }}/webapp:${{ env.TAG }} -f WebApp.Dockerfile .
+          docker push ${{ secrets.ACR_DEV_LOGIN_SERVER }}/webapp:${{ env.TAG }}
\ No newline at end of file

From f041cc370b61f217ca344758b31cbc3bc57fed91 Mon Sep 17 00:00:00 2001
From: Ajit Padhi <v-padhiajit@microsoft.com>
Date: Wed, 11 Dec 2024 14:06:31 +0530
Subject: [PATCH 6/7] removed unwanted branch

---
 .github/workflows/docker-build-and-push.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml
index c737f6a61..c02cebae6 100644
--- a/.github/workflows/docker-build-and-push.yml
+++ b/.github/workflows/docker-build-and-push.yml
@@ -7,7 +7,6 @@ on:
       - main
       - dev
       - demo
-      - dev-test
   workflow_dispatch: # Add this line to enable manual triggering
 
 jobs:

From 4f922e1772094041bed47151bf55f288670177de Mon Sep 17 00:00:00 2001
From: Ajit Padhi <v-padhiajit@microsoft.com>
Date: Wed, 11 Dec 2024 14:10:01 +0530
Subject: [PATCH 7/7] updated workflow

---
 .github/workflows/docker-build-and-push.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml
index c02cebae6..70b96796d 100644
--- a/.github/workflows/docker-build-and-push.yml
+++ b/.github/workflows/docker-build-and-push.yml
@@ -29,7 +29,7 @@ jobs:
           username: ${{ secrets.ACR_USERNAME }}
           password: ${{ secrets.ACR_PASSWORD }}
 
-      - name: Log in to Azure Container Registry
+      - name: Log in to Azure Container Registry (Dev/Demo)
         if: ${{ github.ref_name == 'dev' || github.ref_name == 'demo' }}
         uses: azure/docker-login@v2
         with:
@@ -54,7 +54,7 @@ jobs:
           docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/webapp:${{ env.TAG }} -f WebApp.Dockerfile .
           docker push ${{ secrets.ACR_LOGIN_SERVER }}/webapp:${{ env.TAG }}
 
-      - name: Build and push Docker image
+      - name: Build and push Docker image (Dev/Demo)
         if: ${{ github.ref_name == 'dev' || github.ref_name == 'demo' }}
         run: |
           docker build -t ${{ secrets.ACR_DEV_LOGIN_SERVER }}/webapp:${{ env.TAG }} -f WebApp.Dockerfile .