Use ACR service connection when pushing containers (#1484)

* Update build-and-push-containers.yml * Update build-and-push-containers.yml * Update build-and-push-containers.yml * Update build-and-push-containers.yml * test * test * test * test * test * test * test * test * test * test * test * test * test * test * test * test * test * test * test * test * test * test * test * test * add comment * Update azure-pipelines-ci.yml * Update docker-compose.yml * revert compose * Update .pipelines/templates/build-and-push-containers.yml Co-authored-by: Omri Mendels <[email protected]> --------- Co-authored-by: Omri Mendels <[email protected]>
microsoft · Nov 15, 2024 · a0a5f89 · a0a5f89
1 parent fde30dd
commit a0a5f89
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.pipelines/templates/build-and-push-containers.yml b/.pipelines/templates/build-and-push-containers.yml
@@ -28,10 +28,12 @@ steps:
   - task: DockerCompose@0
     displayName: Push Presidio Images to ACR
     inputs:
-        action: 'Push services'
+        action: Push services
         dockerComposeFile: ${{ parameters.DOCKER_COMPOSE_FILE }}
-        containerregistrytype: 'Container Registry'
-        dockerRegistryEndpoint: 'presidio-acr'
+        containerregistrytype: Azure Container Registry
+        # Passing as an object since by default a double forward-slash is added to the end of the registry name (https://presidio.azurecr.io//oauth2/exchange)
+        azureContainerRegistry: '{"loginServer":"$(ACR_REGISTRY_NAME).azurecr.io"}'
+        azureSubscriptionEndpoint: ${{ parameters.AZURE_SUBSCRIPTION }}
         projectName: 'microsoft_presidio'
         dockerComposeFileArgs: |
           REGISTRY_NAME=${{ parameters.REGISTRY_NAME }}

diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml
@@ -46,8 +46,9 @@ stages:
               projectName: 'microsoft_presidio'
               dockerComposeCommand: pull
               dockerComposeFile: docker-compose.yml
-              containerregistrytype: 'Container Registry'
-              dockerRegistryEndpoint: 'presidio-acr'
+              containerregistrytype: Azure Container Registry
+              azureSubscriptionEndpoint: $(ACR_AZURE_SUBSCRIPTION)
+              azureContainerRegistry: '$(ACR_REGISTRY_NAME).azurecr.io'
               dockerComposeFileArgs: |
                 REGISTRY_NAME=$(REGISTRY_NAME)
                 TAG=$(TAG)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -18,7 +18,7 @@ stages:
       pool:
         vmImage: 'ubuntu-latest'
       variables:
-        REGISTRY_NAME: '$(ACR_REGISTRY_NAME).azurecr.io/'
+        REGISTRY_NAME: '$(ACR_REGISTRY_NAME).azurecr.io'
         TAG: ':$(Build.BuildId)'
       steps:
         - task: DockerCompose@0