From 2b9654263786e7273ee84cc2f31524d08a6f4890 Mon Sep 17 00:00:00 2001 From: Rachael Sewell Date: Wed, 16 Oct 2024 15:02:59 -0700 Subject: [PATCH 1/2] pass token creds when setting container for prod deploy (#52728) --- .github/workflows/azure-prod-build-deploy.yml | 2 +- src/rest/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/azure-prod-build-deploy.yml b/.github/workflows/azure-prod-build-deploy.yml index d84551fb9cae..06da6426068b 100644 --- a/.github/workflows/azure-prod-build-deploy.yml +++ b/.github/workflows/azure-prod-build-deploy.yml @@ -119,7 +119,7 @@ jobs: - name: 'Apply updated docker-compose.prod.yaml config to canary slot' run: | - az webapp config container set --multicontainer-config-type COMPOSE --multicontainer-config-file docker-compose.prod.yaml --slot ${{ env.SLOT_NAME }} -n ${{ env.APP_SERVICE_NAME }} -g ${{ env.RESOURCE_GROUP_NAME }} + az webapp config container set --multicontainer-config-type COMPOSE --multicontainer-config-file docker-compose.prod.yaml --slot ${{ env.SLOT_NAME }} -n ${{ env.APP_SERVICE_NAME }} -g ${{ env.RESOURCE_GROUP_NAME }} --container-registry-url ${{ secrets.PROD_REGISTRY_SERVER }} --container-registry-user ${{ env.ACR_TOKEN_NAME }} --container-registry-password ${{ env.ACR_TOKEN_VALUE }} # Watch canary slot instances to see when all the instances are ready - name: Check that canary slot is ready diff --git a/src/rest/README.md b/src/rest/README.md index bb89442099a2..1c483805a47d 100644 --- a/src/rest/README.md +++ b/src/rest/README.md @@ -77,4 +77,4 @@ Writers can also add an introduction paragraph _above_ the following Markdown co Slack: `#docs-engineering` Repo: `github/docs-engineering` -If you have a question about the REST pipeline, you can ask in the `#docs-engineering` Slack channel. If you notice a problem with the REST pipeline, you can open an issue in the `github/docs-engineering` repository. \ No newline at end of file +If you have a question about the REST pipeline, you can ask in the `#docs-engineering` Slack channel. If you notice a problem with the REST pipeline, you can open an issue in the `github/docs-engineering` repository. 🚀 From ac60d570fdf10f82806f726e9bc91d97d262f179 Mon Sep 17 00:00:00 2001 From: Kevin Heis Date: Wed, 16 Oct 2024 15:24:04 -0700 Subject: [PATCH 2/2] Update README.md (#52740) --- src/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/README.md b/src/README.md index b9e6d514c25e..4cb74fb47748 100644 --- a/src/README.md +++ b/src/README.md @@ -60,3 +60,5 @@ it's important to point out two things: 1. When you add an entry to `.github/workflows/test.yml`, and it's gone into `main`, don't forget to add it to the branch protection's required checks. + +❖