From 4e31514908ccaf430361b293c08c9cbdd452668a Mon Sep 17 00:00:00 2001 From: Ben Broderick Phillips Date: Tue, 19 Mar 2024 19:46:41 -0400 Subject: [PATCH] use acr login and m365 policy --- eng/pipelines/publish-docker-image-isolated.yml | 6 ------ eng/pipelines/templates/stages/1es-redirect.yml | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/publish-docker-image-isolated.yml b/eng/pipelines/publish-docker-image-isolated.yml index a5441eb1af2..095da937fc2 100644 --- a/eng/pipelines/publish-docker-image-isolated.yml +++ b/eng/pipelines/publish-docker-image-isolated.yml @@ -86,12 +86,6 @@ stages: os: linux steps: - - task: Docker@2 - displayName: Login to ACR - inputs: - command: login - containerRegistry: ${{ parameters.ContainerRegistry }} - - pwsh: | $configurations = '${{ convertToJson(parameters.DockerDeployments) }}' -replace '\\', '/' $assembledDependentTags = $(Build.SourcesDirectory)/eng/pipelines/templates/scripts/get-docker-manifest-input.ps1 ` diff --git a/eng/pipelines/templates/stages/1es-redirect.yml b/eng/pipelines/templates/stages/1es-redirect.yml index ef9771564f5..57d163cae8b 100644 --- a/eng/pipelines/templates/stages/1es-redirect.yml +++ b/eng/pipelines/templates/stages/1es-redirect.yml @@ -36,5 +36,8 @@ extends: psscriptanalyzer: compiled: true break: true + policy: M365 + authenticatedContainerRegistries: + - serviceConnection: Azure SDK ACR stages: ${{ parameters.stages }}