Skip to content

Commit 2ac4a94

Browse files
Merge pull request #231 from microsoft/psl-main-mergedown-dev
chore: merge-down main into dev
2 parents ebd74d3 + 6136880 commit 2ac4a94

3 files changed

Lines changed: 7 additions & 0 deletions

File tree

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ jobs:
9292
context: ./src/backend-api
9393
file: ./src/backend-api/Dockerfile
9494
push: ${{ github.event_name != 'pull_request' && (github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix') }}
95+
provenance: false
9596
tags: |
9697
${{ steps.registry.outputs.ext_registry }}/backend-api:${{ env.BASE_TAG }}
9798
${{ steps.registry.outputs.ext_registry }}/backend-api:${{ env.DATE_TAG }}
@@ -102,6 +103,7 @@ jobs:
102103
context: ./src/processor
103104
file: ./src/processor/Dockerfile
104105
push: ${{ github.event_name != 'pull_request' && (github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix') }}
106+
provenance: false
105107
tags: |
106108
${{ steps.registry.outputs.ext_registry }}/processor:${{ env.BASE_TAG }}
107109
${{ steps.registry.outputs.ext_registry }}/processor:${{ env.DATE_TAG }}
@@ -112,6 +114,7 @@ jobs:
112114
context: ./src/frontend
113115
file: ./src/frontend/Dockerfile
114116
push: ${{ github.event_name != 'pull_request' && (github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix') }}
117+
provenance: false
115118
tags: |
116119
${{ steps.registry.outputs.ext_registry }}/frontend:${{ env.BASE_TAG }}
117120
${{ steps.registry.outputs.ext_registry }}/frontend:${{ env.DATE_TAG }}

.github/workflows/job-docker-build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ jobs:
6767
context: ./src/backend-api
6868
file: ./src/backend-api/Dockerfile
6969
push: true
70+
provenance: false
7071
tags: |
7172
${{ secrets.ACR_TEST_LOGIN_SERVER }}/backend-api:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}
7273
${{ secrets.ACR_TEST_LOGIN_SERVER }}/backend-api:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}_${{ github.run_number }}
@@ -79,6 +80,7 @@ jobs:
7980
context: ./src/processor
8081
file: ./src/processor/Dockerfile
8182
push: true
83+
provenance: false
8284
tags: |
8385
${{ secrets.ACR_TEST_LOGIN_SERVER }}/processor:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}
8486
${{ secrets.ACR_TEST_LOGIN_SERVER }}/processor:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}_${{ github.run_number }}
@@ -91,6 +93,7 @@ jobs:
9193
context: ./src/frontend
9294
file: ./src/frontend/Dockerfile
9395
push: true
96+
provenance: false
9497
tags: |
9598
${{ secrets.ACR_TEST_LOGIN_SERVER }}/frontend:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}
9699
${{ secrets.ACR_TEST_LOGIN_SERVER }}/frontend:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}_${{ github.run_number }}

docs/DeploymentGuide.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ Select one of the following options to deploy the Container Migration Solution A
156156
**Required Tools:**
157157
- [PowerShell 7.0+](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell)
158158
- [Azure Developer CLI (azd) 1.18.0+](https://aka.ms/install-azd)
159+
- [Bicep CLI 0.33.0+](https://learn.microsoft.com/azure/azure-resource-manager/bicep/install)
159160
- [Python 3.9+](https://www.python.org/downloads/)
160161
- [Docker Desktop](https://www.docker.com/products/docker-desktop/)
161162
- [Git](https://git-scm.com/downloads)

0 commit comments

Comments
 (0)