From cada92e530abf1667ee6cb356b5783ec10e9e2f2 Mon Sep 17 00:00:00 2001
From: Sathishdodda <126811993+Sathishdodda@users.noreply.github.com>
Date: Mon, 15 Jul 2024 09:50:21 -0400
Subject: [PATCH 1/4] Update pythonapp.yml


From 0b7a0f062e29c270866117cca56b725d5dd145fe Mon Sep 17 00:00:00 2001
From: Sathishdodda <126811993+Sathishdodda@users.noreply.github.com>
Date: Mon, 15 Jul 2024 09:52:27 -0400
Subject: [PATCH 2/4] Update pythonapp.yml

---
 .github/workflows/pythonapp.yml | 47 ++++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml
index 5f250a7..6417e45 100644
--- a/.github/workflows/pythonapp.yml
+++ b/.github/workflows/pythonapp.yml
@@ -1,20 +1,41 @@
-name: Python application
+name: Build and Push Docker Image to ACR
 
 on:
   push:
-   branches: [ master ]
-  pull_request:
-    branches: [ master ]
-      
-jobs:
-  build:
+    branches:
+      - main
+    paths:
+      - Simple-Web-App/Dockerfile
 
+jobs:
+  build-and-push:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Build & Push Image
-      run: |
-        echo "${{ secrets.DOCKERPW }}" | docker login -u "dab8106" --password-stdin
-        docker image build -t dab8106/pyflask:latest .
-        docker push dab8106/pyflask:latest
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Azure CLI
+        env:
+          ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
+          ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}
+          ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
+          ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}
+        run: |
+          az login --service-principal \
+            --username "${{ secrets.ARM_CLIENT_ID }}" \
+            --password "${{ secrets.ARM_CLIENT_SECRET }}" \
+            --tenant "${{ secrets.ARM_TENANT_ID }}"
+          az account set --subscription "${{ secrets.ARM_SUBSCRIPTION_ID }}"
+
+      - name: Verify Azure Login
+        run: az account show
+
+      - name: Build and Push Docker Image
+        env:
+          REGISTRY: ${{ secrets.ACR_NAME }}.azurecr.io
+          IMAGE_NAME: flask01
+        run: |
+          az acr login --name ${{ secrets.ACR_NAME }}
+          docker build -t $REGISTRY/$IMAGE_NAME:latest .
+          docker push $REGISTRY/$IMAGE_NAME:latest

From e8334e69b0c8acdb5e0892604fd98c9d85bb0161 Mon Sep 17 00:00:00 2001
From: Sathishdodda <126811993+Sathishdodda@users.noreply.github.com>
Date: Mon, 15 Jul 2024 09:55:35 -0400
Subject: [PATCH 3/4] Update pythonapp.yml

---
 .github/workflows/pythonapp.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml
index 6417e45..fba0df1 100644
--- a/.github/workflows/pythonapp.yml
+++ b/.github/workflows/pythonapp.yml
@@ -3,10 +3,7 @@ name: Build and Push Docker Image to ACR
 on:
   push:
     branches:
-      - main
-    paths:
-      - Simple-Web-App/Dockerfile
-
+      - master
 jobs:
   build-and-push:
     runs-on: ubuntu-latest

From d3387d4422693445173be3c248a9c6a4207a7e55 Mon Sep 17 00:00:00 2001
From: Sathishdodda <126811993+Sathishdodda@users.noreply.github.com>
Date: Mon, 15 Jul 2024 10:07:25 -0400
Subject: [PATCH 4/4] Update pythonapp.yml