From bcb6b82094bf03f5d6c1817321be3328771db1c9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 18:31:05 +0000 Subject: [PATCH 1/2] Update DFE-Digital/deploy-azure-container-apps-action action to v2 --- .github/workflows/build-and-push-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml index ce9598b..6d9faed 100644 --- a/.github/workflows/build-and-push-image.yml +++ b/.github/workflows/build-and-push-image.yml @@ -73,7 +73,7 @@ jobs: deploy-image: name: Deploy to environment needs: [ set-env ] - uses: DFE-Digital/deploy-azure-container-apps-action/.github/workflows/build-push-deploy.yml@v1.1.0 + uses: DFE-Digital/deploy-azure-container-apps-action/.github/workflows/build-push-deploy.yml@v2.1.0 with: docker-image-name: 'identapi-app' docker-build-file-name: 'docker/Dockerfile' From c36d72c6fa6faf6a6951d4a5fcc4b913e2ef619c Mon Sep 17 00:00:00 2001 From: Ash Davies <3853061+DrizzlyOwl@users.noreply.github.com> Date: Wed, 1 May 2024 14:10:23 +0100 Subject: [PATCH 2/2] Switch to using new credentials --- .github/workflows/build-and-push-image.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml index 6d9faed..e64259c 100644 --- a/.github/workflows/build-and-push-image.yml +++ b/.github/workflows/build-and-push-image.yml @@ -79,9 +79,8 @@ jobs: docker-build-file-name: 'docker/Dockerfile' environment: ${{ needs.set-env.outputs.environment }} secrets: - azure-acr-client-id: ${{ secrets.AZURE_ACR_CLIENTID }} - azure-acr-secret: ${{ secrets.AZURE_ACR_SECRET }} - azure-acr-url: ${{ secrets.AZURE_ACR_URL }} + azure-acr-credentials: ${{ secrets.ACR_CREDENTIALS }} + azure-acr-name: ${{ secrets.ACR_NAME }} azure-aca-credentials: ${{ secrets.AZURE_ACA_CREDENTIALS }} azure-aca-name: ${{ secrets.AZURE_ACA_NAME }} azure-aca-resource-group: ${{ secrets.AZURE_ACA_RESOURCE_GROUP }}