Merge pull request #197 from microsoft/PSL-US-12925_1

ci: Docker image yml file updated for building conditionally

Author: Roopan-Microsoft

.github/workflows/docker-build-and-push.yml

@@ -1,17 +1,16 @@
 name: Build and Push Docker Image
 
 on:
+  push:
+    branches: [main, dev, demo]
   pull_request:
+    branches: [main, dev, demo]
     types:
       - opened
       - ready_for_review
       - reopened
       - synchronize
-    branches:
-      - main
-      - dev
-      - demo
-  workflow_dispatch: # Add this line to enable manual triggering
+  merge_group:
 
 jobs:
   build-and-push:
@@ -61,4 +60,3 @@ jobs:
           tags: |
             ${{ steps.registry.outputs.registry }}/webapp:${{ steps.determine_tag.outputs.tagname }}
             ${{ steps.registry.outputs.registry }}/webapp:${{ steps.determine_tag.outputs.tagname }}_${{ steps.date.outputs.date }}_${{ github.run_number }}
-