Change ACR instance (#1089)

* Update build-and-push-containers.yml * Update build-and-push-containers.yml * Update build-and-push-containers.yml * Update azure-pipelines-ci.yml
microsoft · Jun 6, 2023 · 838d402 · 838d402
1 parent 9090f93
commit 838d402
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/.pipelines/templates/build-and-push-containers.yml b/.pipelines/templates/build-and-push-containers.yml
@@ -26,12 +26,11 @@ steps:
   - task: DockerCompose@0
     displayName: Push Presidio Images to ACR
     inputs:
-        action: Push services
-        dockerComposeFile: ${{ parameters.DOCKER_COMPOSE_FILE }}  
-        containerregistrytype: Azure Container Registry
-        azureSubscriptionEndpoint: ${{ parameters.AZURE_SUBSCRIPTION }}
-        azureContainerRegistry: ${{ parameters.REGISTRY_NAME }}
+        action: 'Push services'
+        dockerComposeFile: ${{ parameters.DOCKER_COMPOSE_FILE }}
+        containerregistrytype: 'Container Registry'
+        dockerRegistryEndpoint: 'presidio-acr'
         dockerComposeFileArgs: |
           REGISTRY_NAME=${{ parameters.REGISTRY_NAME }}
           IMAGE_PREFIX=${{ parameters.IMAGE_PREFIX }}
-          TAG=${{ parameters.TAG }}
+          TAG=${{ parameters.TAG }}
diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml
@@ -45,9 +45,8 @@ stages:
               action: Run a Docker Compose command
               dockerComposeCommand: pull
               dockerComposeFile: docker-compose.yml
-              containerregistrytype: Azure Container Registry
-              azureSubscriptionEndpoint: $(ACR_AZURE_SUBSCRIPTION)
-              azureContainerRegistry: '$(ACR_REGISTRY_NAME).azurecr.io'
+              containerregistrytype: 'Container Registry'
+              dockerRegistryEndpoint: 'presidio-acr'
               dockerComposeFileArgs: |
                 REGISTRY_NAME=$(REGISTRY_NAME)
                 TAG=$(TAG)