fix: Container issue fix for multiple branch

.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

.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,15 +36,15 @@ 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 }}
         username: ${{ inputs.username }}
         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 }}

README.md

@@ -171,6 +171,8 @@ The demo, which uses containers pre-built from the main branch is available by c
 
 [![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure-Samples%2Fchat-with-your-data-solution-accelerator%2Fmain%2Finfra%2Fmain.json)
 
+When Deployment is complete, follow steps in [Set Up Authentication in Azure App Service](./docs/azure_app_service_auth_setup.md) to add app authentication to your web app running on Azure App Service
+
 **Note**: The default configuration deploys an OpenAI Model "gpt-35-turbo" with version 0613. However, not all
 locations support this version. If you're deploying to a location that doesn't support version 0613, you'll need to
 switch to a lower version. To find out which versions are supported in different regions, visit the

docs/azure_app_service_auth_setup.md

@@ -0,0 +1,58 @@
+# Set Up Authentication in Azure App Service
+
+## Step 1: Add Authentication in Azure App Service configuration
+
+1. Click on `Authentication` from left menu.
+
+![Authentication](images/AppAuthentication.png)
+
+2. Click on `+ Add Provider` to see a list of identity providers.
+
+![Authentication Identity](images/AppAuthenticationIdentity.png)
+
+3. Click on `+ Add Provider` to see a list of identity providers.
+
+![Add Provider](images/AppAuthIdentityProvider.png)
+
+4. Select the first option `Microsoft Entra Id` from the drop-down list. If `Create new app registration` is disabled, go to [Step 1a](#step-1a-creating-a-new-app-registration).
+
+![Add Provider](images/AppAuthIdentityProviderAdd.png)
+
+5. Accept the default values and click on `Add` button to go back to the previous page with the identify provider added.
+
+![Add Provider](images/AppAuthIdentityProviderAdded.png)
+
+### Step 1a: Creating a new App Registration
+
+1. Click on `Home` and select `Microsoft Entra ID`.
+
+![Microsoft Entra ID](images/MicrosoftEntraID.png)
+
+2. Click on `App registrations`.
+
+![App registrations](images/Appregistrations.png)
+
+3. Click on `+ New registration`.
+
+![New Registrations](images/NewRegistration.png)
+
+4. Provide the `Name`, select supported account types as `Accounts in this organizational directory only(Contoso only - Single tenant)`, select platform as `Web`, enter/select the `URL` and register.
+
+![Add Details](images/AddDetails.png)
+
+5. After application is created sucessfully, then click on `Add a Redirect URL`.
+
+![Redirect URL](images/AddRedirectURL.png)
+
+6. Click on `+ Add a platform`.
+
+![+ Add platform](images/AddPlatform.png)
+
+7. Click on `Web`.
+
+![Web](images/Web.png)
+
+8. Enter the `web app URL` (Provide the app service name in place of XXXX) and Save. Then go back to [Step 1](#step-1-add-authentication-in-azure-app-service-configuration) and follow from _Point 4_ choose `Pick an existing app registration in this directory` from the Add an Identity Provider page and provide the newly registered App Name.
+E.g. https://appservicename.azurewebsites.net/.auth/login/aad/callback
+
+![Add Details](images/WebAppURL.png)