diff --git a/.github/workflows/azure-prod-build-deploy.yml b/.github/workflows/azure-prod-build-deploy.yml index e91a22aa5dc0..65cea4d33eee 100644 --- a/.github/workflows/azure-prod-build-deploy.yml +++ b/.github/workflows/azure-prod-build-deploy.yml @@ -66,7 +66,6 @@ jobs: - name: 'Create Azure Container Registry Token' env: CONTAINER_REGISTRY_SERVER: ${{ secrets.PROD_REGISTRY_SERVER }} - CONTAINER_REPO: ${{ github.repository }} run: npm run create-acr-token - name: 'Docker login' @@ -119,7 +118,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 }} --container-registry-url ${{ secrets.PROD_REGISTRY_SERVER }} --container-registry-user ${{ env.ACR_TOKEN_NAME }} --container-registry-password ${{ env.ACR_TOKEN_VALUE }} + 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 }} # Watch canary slot instances to see when all the instances are ready - name: Check that canary slot is ready diff --git a/package.json b/package.json index 2044a032df38..d9ee1dcd7ebe 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "content-changes-table-comment": "tsx src/workflows/content-changes-table-comment.ts", "copy-fixture-data": "node src/tests/scripts/copy-fixture-data.js", "count-translation-corruptions": "tsx src/languages/scripts/count-translation-corruptions.ts", - "create-acr-token": "tsx src/workflows/acr-create-token.ts", + "create-acr-token": "tsx src/workflows/acr-create-token.js", "debug": "cross-env NODE_ENV=development ENABLED_LANGUAGES=en nodemon --inspect src/frame/server.ts", "delete-orphan-translation-files": "tsx src/workflows/delete-orphan-translation-files.ts", "deleted-features-pr-comment": "tsx src/data-directory/scripts/deleted-features-pr-comment.ts", diff --git a/src/rest/README.md b/src/rest/README.md index 1c483805a47d..bb89442099a2 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. 🚀 +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 diff --git a/src/workflows/acr-create-token.ts b/src/workflows/acr-create-token.ts index a96f763a7aff..4a17817ca211 100755 --- a/src/workflows/acr-create-token.ts +++ b/src/workflows/acr-create-token.ts @@ -10,7 +10,7 @@ dotenv.config() const acrTokenName = process.env.ACR_TOKEN_NAME const acrServer = process.env.CONTAINER_REGISTRY_SERVER -const repo = process.env.CONTAINER_REPO +const repo = process.env.GITHUB_REPOSITORY function main() { // Get the current time and add 30 minutes to it