use acr login and m365 policy

Azure · Mar 19, 2024 · 8e3f6de · 8e3f6de
1 parent 2623b00
commit 8e3f6de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -23,6 +23,8 @@ extends:
   ${{ else }}:
     template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates
   parameters:
+    authenticatedContainerRegistries:
+      - serviceConnection: azsdkengsys
     settings:
       skipBuildTagsForGitHubPullRequests: true
     sdl:
@@ -36,5 +38,6 @@ extends:
       psscriptanalyzer:
         compiled: true
         break: true
+      policy: M365
 
     stages: ${{ parameters.stages }}