Skip to content

chore: merge-down main into dev #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Roopan-Microsoft merged 7 commits into from
May 8, 2026
+7 −0
Merged

chore: merge-down main into dev #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
df7f71b
Merge pull request #205 from microsoft/dev
Roopan-Microsoft Apr 24, 2026
76fb954
fix(ci): disable buildx provenance to fix ACR Standard push (400)
Copilot Apr 24, 2026
f0e9975
Merge pull request #206 from microsoft/hotfix/disable-buildx-provenan…
Dongbumlee Apr 24, 2026
7474d9f
docs: add Bicep CLI prerequisite to local deployment guide
Rafi-Microsoft May 6, 2026
23525d9
Merge pull request #215 from microsoft/dev
Roopan-Microsoft May 6, 2026
3552f12
Merge pull request #221 from microsoft/psl-addBicepVer
Roopan-Microsoft May 7, 2026
6136880
Merge branch 'main' into psl-main-mergedown-dev
Shreyas-Microsoft May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/docker-build-and-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ jobs:
context: ./src/backend-api
file: ./src/backend-api/Dockerfile
push: ${{ github.event_name != 'pull_request' && (github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix') }}
provenance: false
tags: |
Comment thread
Shreyas-Microsoft marked this conversation as resolved.
${{ steps.registry.outputs.ext_registry }}/backend-api:${{ env.BASE_TAG }}
${{ steps.registry.outputs.ext_registry }}/backend-api:${{ env.DATE_TAG }}
Expand All @@ -102,6 +103,7 @@ jobs:
context: ./src/processor
file: ./src/processor/Dockerfile
push: ${{ github.event_name != 'pull_request' && (github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix') }}
provenance: false
tags: |
Comment thread
Shreyas-Microsoft marked this conversation as resolved.
${{ steps.registry.outputs.ext_registry }}/processor:${{ env.BASE_TAG }}
${{ steps.registry.outputs.ext_registry }}/processor:${{ env.DATE_TAG }}
Expand All @@ -112,6 +114,7 @@ jobs:
context: ./src/frontend
file: ./src/frontend/Dockerfile
push: ${{ github.event_name != 'pull_request' && (github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix') }}
provenance: false
tags: |
Comment thread
Shreyas-Microsoft marked this conversation as resolved.
${{ steps.registry.outputs.ext_registry }}/frontend:${{ env.BASE_TAG }}
${{ steps.registry.outputs.ext_registry }}/frontend:${{ env.DATE_TAG }}
3 changes: 3 additions & 0 deletions .github/workflows/job-docker-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ jobs:
context: ./src/backend-api
file: ./src/backend-api/Dockerfile
push: true
provenance: false
tags: |
${{ secrets.ACR_TEST_LOGIN_SERVER }}/backend-api:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}
${{ secrets.ACR_TEST_LOGIN_SERVER }}/backend-api:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}_${{ github.run_number }}
Expand All @@ -79,6 +80,7 @@ jobs:
context: ./src/processor
file: ./src/processor/Dockerfile
push: true
provenance: false
tags: |
${{ secrets.ACR_TEST_LOGIN_SERVER }}/processor:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}
${{ secrets.ACR_TEST_LOGIN_SERVER }}/processor:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}_${{ github.run_number }}
Expand All @@ -91,6 +93,7 @@ jobs:
context: ./src/frontend
file: ./src/frontend/Dockerfile
push: true
provenance: false
tags: |
${{ secrets.ACR_TEST_LOGIN_SERVER }}/frontend:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}
${{ secrets.ACR_TEST_LOGIN_SERVER }}/frontend:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}_${{ github.run_number }}
Expand Down
1 change: 1 addition & 0 deletions docs/DeploymentGuide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ Select one of the following options to deploy the Container Migration Solution A
**Required Tools:**
- [PowerShell 7.0+](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell)
- [Azure Developer CLI (azd) 1.18.0+](https://aka.ms/install-azd)
- [Bicep CLI 0.33.0+](https://learn.microsoft.com/azure/azure-resource-manager/bicep/install)
- [Python 3.9+](https://www.python.org/downloads/)
- [Docker Desktop](https://www.docker.com/products/docker-desktop/)
- [Git](https://git-scm.com/downloads)
Expand Down
Loading