From cf413c20940dbc5f61be5b7fd4879fd0fcd92272 Mon Sep 17 00:00:00 2001
From: Ajit Padhi <v-padhiajit@microsoft.com>
Date: Wed, 27 Nov 2024 16:56:42 +0530
Subject: [PATCH 01/11] updated workflow

---
 .github/workflows/build-docker-images.yml | 13 ++++---------
 .github/workflows/build-docker.yml        | 11 +++++++----
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml
index 3b57b5c1d..76b66f627 100644
--- a/.github/workflows/build-docker-images.yml
+++ b/.github/workflows/build-docker-images.yml
@@ -4,15 +4,9 @@ on:
   workflow_run:
     workflows: [Tests]
     types: [completed]
-    branches:
-      - main
-      - dev
-      - demo
+    branches: [main, dev, demo]
   pull_request:
-    branches:
-      - main
-      - dev
-      - demo
+    branches: [main, dev, demo]
     types:
     - opened
     - ready_for_review
@@ -38,5 +32,6 @@ jobs:
       username: ${{ github.event.workflow_run.head_branch == 'main' && 'fruoccopublic' || 'cwydcontainerreg'}}
       app_name: ${{ matrix.app_name }}
       dockerfile: ${{ matrix.dockerfile }}
-      push: ${{ github.event.workflow_run.head_branch == 'main' || github.event.workflow_run.head_branch == 'dev' || github.event.workflow_run.head_branch == 'demo' }}
+      branch: ${{ github.event.workflow_run.head_branch }}
+      push: ${{ github.event_name == 'workflow_run' && (github.event.workflow_run.head_branch == 'main' || github.event.workflow_run.head_branch == 'dev' || github.event.workflow_run.head_branch == 'demo') }}
     secrets: inherit
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 0d14652e9..843f2e898 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -15,6 +15,9 @@ on:
       dockerfile:
         required: true
         type: string
+      branch:
+        required: false
+        type: string
       push:
         required: true
         type: boolean
@@ -33,7 +36,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Docker Login
-      if: ${{ inputs.push == true && github.ref_name == 'main' }}
+      if: ${{ inputs.push == true && inputs.branch == 'main' }}
       uses: docker/login-action@v3
       with:
         registry: ${{ inputs.registry }}
@@ -41,7 +44,7 @@ jobs:
         password: ${{ secrets.DOCKER_PASSWORD }}
 
     - name: Dev Docker Login
-      if: ${{ inputs.push == true && (github.ref_name == 'dev' || github.ref_name == 'demo') }}
+      if: ${{ inputs.push == true && (inputs.branch == 'dev' || inputs.branch == 'demo') }}
       uses: docker/login-action@v3
       with:
         registry: ${{ inputs.registry }}
@@ -61,7 +64,7 @@ jobs:
         context: .
         file: ${{ inputs.dockerfile }}
         push: ${{ inputs.push }}
-        cache-from: type=registry,ref=${{ inputs.registry }}/${{ inputs.app_name}}:${{ github.ref_name == 'main' && 'latest' || github.ref_name == 'dev' && 'dev' || github.ref_name == 'demo' && 'demo' || 'latest' }}
+        cache-from: type=registry,ref=${{ inputs.registry }}/${{ inputs.app_name}}:${{ inputs.branch == 'main' && 'latest' || inputs.branch == 'dev' && 'dev' || inputs.branch == 'demo' && 'demo' || 'latest' }}
         tags: |
-          ${{ inputs.registry }}/${{ inputs.app_name}}:${{ github.ref_name == 'main' && 'latest' || github.ref_name == 'dev' && 'dev' || github.ref_name == 'demo' && 'demo' || 'latest' }}
+          ${{ inputs.registry }}/${{ inputs.app_name}}:${{ inputs.branch == 'main' && 'latest' || inputs.branch == 'dev' && 'dev' || inputs.branch == 'demo' && 'demo' || 'latest' }}
           ${{ inputs.registry }}/${{ inputs.app_name}}:${{ steps.date.outputs.date }}_${{ github.run_number }}

From b8eecdef36c85d114f8d643b8b19025afab0ef93 Mon Sep 17 00:00:00 2001
From: Ajit Padhi <v-padhiajit@microsoft.com>
Date: Wed, 27 Nov 2024 17:39:20 +0530
Subject: [PATCH 02/11] added echo in workflow

---
 .github/workflows/build-docker.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 843f2e898..ae95d1506 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -16,7 +16,7 @@ on:
         required: true
         type: string
       branch:
-        required: false
+        required: true
         type: string
       push:
         required: true
@@ -31,7 +31,11 @@ jobs:
   docker-build:
     runs-on: ubuntu-latest
     steps:
-
+    - name: Print target branch detail
+      run: |
+        echo "Target branch:" ${{ inputs.branch }}
+        echo "Target branch status:" ${{ inputs.push }}
+        echo "Target registry status:" ${{ inputs.registry }}
     - name: Checkout
       uses: actions/checkout@v4
 

From db4732f0da2534909bf3900e7637db06184119cd Mon Sep 17 00:00:00 2001
From: Roopan P M <v-roopanpm@microsoft.com>
Date: Wed, 27 Nov 2024 18:11:55 +0530
Subject: [PATCH 03/11] Docker yml updated checkout code

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

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 843f2e898..bd2e400e3 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -34,6 +34,8 @@ jobs:
 
     - name: Checkout
       uses: actions/checkout@v4
+      with:
+        ref: ${{ github.event.workflow_run.head_branch }}
 
     - name: Docker Login
       if: ${{ inputs.push == true && inputs.branch == 'main' }}

From d507ba590cac9297c6c59c95207cb4f04b630e85 Mon Sep 17 00:00:00 2001
From: Roopan P M <v-roopanpm@microsoft.com>
Date: Wed, 27 Nov 2024 18:30:37 +0530
Subject: [PATCH 04/11] added checkout in docker images yml file

---
 .github/workflows/build-docker-images.yml | 26 +++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml
index 76b66f627..e31282b2f 100644
--- a/.github/workflows/build-docker-images.yml
+++ b/.github/workflows/build-docker-images.yml
@@ -26,12 +26,20 @@ jobs:
             dockerfile: docker/Backend.Dockerfile
           - app_name: rag-webapp
             dockerfile: docker/Frontend.Dockerfile
-    uses: ./.github/workflows/build-docker.yml
-    with:
-      registry: ${{ github.event.workflow_run.head_branch == 'main' && 'fruoccopublic.azurecr.io' || 'cwydcontainerreg.azurecr.io'}}
-      username: ${{ github.event.workflow_run.head_branch == 'main' && 'fruoccopublic' || 'cwydcontainerreg'}}
-      app_name: ${{ matrix.app_name }}
-      dockerfile: ${{ matrix.dockerfile }}
-      branch: ${{ github.event.workflow_run.head_branch }}
-      push: ${{ github.event_name == 'workflow_run' && (github.event.workflow_run.head_branch == 'main' || github.event.workflow_run.head_branch == 'dev' || github.event.workflow_run.head_branch == 'demo') }}
-    secrets: inherit
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.workflow_run.head_branch }}
+
+      - name: Build Docker Image
+        uses: ./.github/workflows/build-docker.yml
+        with:
+          registry: ${{ github.event.workflow_run.head_branch == 'main' && 'fruoccopublic.azurecr.io' || 'cwydcontainerreg.azurecr.io'}}
+          username: ${{ github.event.workflow_run.head_branch == 'main' && 'fruoccopublic' || 'cwydcontainerreg'}}
+          app_name: ${{ matrix.app_name }}
+          dockerfile: ${{ matrix.dockerfile }}
+          branch: ${{ github.event.workflow_run.head_branch }}
+          push: ${{ github.event_name == 'workflow_run' && (github.event.workflow_run.head_branch == 'main' || github.event.workflow_run.head_branch == 'dev' || github.event.workflow_run.head_branch == 'demo') }}
+          secrets: inherit

From c815e80bb48213cd4b112d20aa1531934853db7d Mon Sep 17 00:00:00 2001
From: Ajit Padhi <v-padhiajit@microsoft.com>
Date: Wed, 27 Nov 2024 18:37:25 +0530
Subject: [PATCH 05/11] updated workflow

---
 .github/workflows/build-docker-images.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml
index e31282b2f..8c369ab20 100644
--- a/.github/workflows/build-docker-images.yml
+++ b/.github/workflows/build-docker-images.yml
@@ -33,6 +33,9 @@ jobs:
         with:
           ref: ${{ github.event.workflow_run.head_branch }}
 
+      - name: List files in workflows directory
+        run: ls -R .github/workflows/
+        
       - name: Build Docker Image
         uses: ./.github/workflows/build-docker.yml
         with:

From 07f5f46b1edf2da3653b974e1752f253a00fdc8e Mon Sep 17 00:00:00 2001
From: Roopan P M <v-roopanpm@microsoft.com>
Date: Wed, 27 Nov 2024 18:42:49 +0530
Subject: [PATCH 06/11] Reverted the head branch code from yml file

---
 .github/workflows/build-docker-images.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml
index e31282b2f..fac777152 100644
--- a/.github/workflows/build-docker-images.yml
+++ b/.github/workflows/build-docker-images.yml
@@ -30,8 +30,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.workflow_run.head_branch }}
 
       - name: Build Docker Image
         uses: ./.github/workflows/build-docker.yml

From b8e3e32eeab68646bf0d7925739f9a2fcbe34314 Mon Sep 17 00:00:00 2001
From: Ajit Padhi <v-padhiajit@microsoft.com>
Date: Wed, 27 Nov 2024 18:46:07 +0530
Subject: [PATCH 07/11] fixed workflow

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

diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml
index 8c369ab20..25580a328 100644
--- a/.github/workflows/build-docker-images.yml
+++ b/.github/workflows/build-docker-images.yml
@@ -33,9 +33,6 @@ jobs:
         with:
           ref: ${{ github.event.workflow_run.head_branch }}
 
-      - name: List files in workflows directory
-        run: ls -R .github/workflows/
-        
       - name: Build Docker Image
         uses: ./.github/workflows/build-docker.yml
         with:
@@ -45,4 +42,4 @@ jobs:
           dockerfile: ${{ matrix.dockerfile }}
           branch: ${{ github.event.workflow_run.head_branch }}
           push: ${{ github.event_name == 'workflow_run' && (github.event.workflow_run.head_branch == 'main' || github.event.workflow_run.head_branch == 'dev' || github.event.workflow_run.head_branch == 'demo') }}
-          secrets: inherit
+        secrets: inherit

From 8bdabc48bbe9f67a719eaaacef35c283fd696ce2 Mon Sep 17 00:00:00 2001
From: Roopan P M <v-roopanpm@microsoft.com>
Date: Wed, 27 Nov 2024 18:55:21 +0530
Subject: [PATCH 08/11] updated secrets as explicity passing

---
 .github/workflows/build-docker-images.yml |  5 +++--
 .github/workflows/build-docker.yml        | 11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml
index d34339022..2585edc8c 100644
--- a/.github/workflows/build-docker-images.yml
+++ b/.github/workflows/build-docker-images.yml
@@ -33,7 +33,7 @@ jobs:
 
       - name: List files in workflows directory
         run: ls -R .github/workflows/
-        
+
       - name: Build Docker Image
         uses: ./.github/workflows/build-docker.yml
         with:
@@ -43,4 +43,5 @@ jobs:
           dockerfile: ${{ matrix.dockerfile }}
           branch: ${{ github.event.workflow_run.head_branch }}
           push: ${{ github.event_name == 'workflow_run' && (github.event.workflow_run.head_branch == 'main' || github.event.workflow_run.head_branch == 'dev' || github.event.workflow_run.head_branch == 'demo') }}
-          secrets: inherit
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          DEV_DOCKER_PASSWORD: ${{ secrets.DEV_DOCKER_PASSWORD }}
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 1014938df..e8f8c6125 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -21,11 +21,12 @@ on:
       push:
         required: true
         type: boolean
-    secrets:
       DOCKER_PASSWORD:
-        required: false
+        required: true
+        type: string
       DEV_DOCKER_PASSWORD:
-        required: false
+        required: true
+        type: string
 
 jobs:
   docker-build:
@@ -47,7 +48,7 @@ jobs:
       with:
         registry: ${{ inputs.registry }}
         username: ${{ inputs.username }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+        password: ${{ inputs.DOCKER_PASSWORD }}
 
     - name: Dev Docker Login
       if: ${{ inputs.push == true && (inputs.branch == 'dev' || inputs.branch == 'demo') }}
@@ -55,7 +56,7 @@ jobs:
       with:
         registry: ${{ inputs.registry }}
         username: ${{ inputs.username }}
-        password: ${{ secrets.DEV_DOCKER_PASSWORD }}
+        password: ${{ inputs.DEV_DOCKER_PASSWORD }}
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3

From 0228f7219e3e9bb0ca2e697fc3605207c26eb975 Mon Sep 17 00:00:00 2001
From: Roopan P M <v-roopanpm@microsoft.com>
Date: Wed, 27 Nov 2024 19:01:12 +0530
Subject: [PATCH 09/11] build docker image supdated

---
 .github/workflows/build-docker-images.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml
index 2585edc8c..881dbdd3c 100644
--- a/.github/workflows/build-docker-images.yml
+++ b/.github/workflows/build-docker-images.yml
@@ -16,6 +16,7 @@ on:
 
 jobs:
   docker-build:
+    runs-on: ubuntu-latest
     if: ${{ github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success' }}
     strategy:
       matrix:
@@ -26,7 +27,6 @@ jobs:
             dockerfile: docker/Backend.Dockerfile
           - app_name: rag-webapp
             dockerfile: docker/Frontend.Dockerfile
-    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4

From a12648af3a618eca5bd985aec06a6ec5a5abf16c Mon Sep 17 00:00:00 2001
From: Ajit Padhi <v-padhiajit@microsoft.com>
Date: Wed, 27 Nov 2024 19:02:44 +0530
Subject: [PATCH 10/11] updated workflow

---
 .github/workflows/build-docker-images.yml |  6 +++---
 .github/workflows/build-docker.yml        | 10 ++--------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml
index 2585edc8c..b667e6ef9 100644
--- a/.github/workflows/build-docker-images.yml
+++ b/.github/workflows/build-docker-images.yml
@@ -30,9 +30,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-
-      - name: List files in workflows directory
-        run: ls -R .github/workflows/
+        with:
+          ref: ${{ github.event.workflow_run.head_branch }}
 
       - name: Build Docker Image
         uses: ./.github/workflows/build-docker.yml
@@ -43,5 +42,6 @@ jobs:
           dockerfile: ${{ matrix.dockerfile }}
           branch: ${{ github.event.workflow_run.head_branch }}
           push: ${{ github.event_name == 'workflow_run' && (github.event.workflow_run.head_branch == 'main' || github.event.workflow_run.head_branch == 'dev' || github.event.workflow_run.head_branch == 'demo') }}
+        env:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
           DEV_DOCKER_PASSWORD: ${{ secrets.DEV_DOCKER_PASSWORD }}
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index e8f8c6125..b0d2b09b9 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -21,12 +21,6 @@ on:
       push:
         required: true
         type: boolean
-      DOCKER_PASSWORD:
-        required: true
-        type: string
-      DEV_DOCKER_PASSWORD:
-        required: true
-        type: string
 
 jobs:
   docker-build:
@@ -48,7 +42,7 @@ jobs:
       with:
         registry: ${{ inputs.registry }}
         username: ${{ inputs.username }}
-        password: ${{ inputs.DOCKER_PASSWORD }}
+        password: ${{ env.DOCKER_PASSWORD }}
 
     - name: Dev Docker Login
       if: ${{ inputs.push == true && (inputs.branch == 'dev' || inputs.branch == 'demo') }}
@@ -56,7 +50,7 @@ jobs:
       with:
         registry: ${{ inputs.registry }}
         username: ${{ inputs.username }}
-        password: ${{ inputs.DEV_DOCKER_PASSWORD }}
+        password: ${{ env.DEV_DOCKER_PASSWORD }}
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3

From d600af2674f4ea9f393b40e60abe4ba0ba2d9784 Mon Sep 17 00:00:00 2001
From: Roopan P M <v-roopanpm@microsoft.com>
Date: Wed, 27 Nov 2024 19:11:55 +0530
Subject: [PATCH 11/11] changed branch head

---
 .github/workflows/build-docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index b0d2b09b9..7735eeab7 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -34,7 +34,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
       with:
-        ref: ${{ github.event.workflow_run.head_branch }}
+        ref: ${{ inputs.branch }}
 
     - name: Docker Login
       if: ${{ inputs.push == true && inputs.branch == 'main' }}