test

microsoft · Nov 14, 2024 · f55b434 · f55b434
1 parent d9375ea
commit f55b434
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/.pipelines/templates/build-and-push-containers.yml b/.pipelines/templates/build-and-push-containers.yml
@@ -25,15 +25,16 @@ steps:
           TAG=${{ parameters.TAG }}
         projectName: 'microsoft_presidio'
 
-  - task: DockerCompose@1
+  - task: DockerCompose@0
     displayName: Push Presidio Images to ACR
     inputs:
-        action: 'Push services'
+        action: Push services
         dockerComposeFile: ${{ parameters.DOCKER_COMPOSE_FILE }}
-        containerregistrytype: 'Azure Container Registry'
+        containerregistrytype: Azure Container Registry
         azureContainerRegistry: ${{ parameters.REGISTRY_NAME }}
-        azureSubscriptionEndpoint: presidio
+        azureSubscriptionEndpoint: ${{ parameters.AZURE_SUBSCRIPTION }}
         projectName: 'microsoft_presidio'
         dockerComposeFileArgs: |
-          REGISTRY_NAME=
+          REGISTRY_NAME=${{ parameters.REGISTRY_NAME }}
+          IMAGE_PREFIX=${{ parameters.IMAGE_PREFIX }}
           TAG=${{ parameters.TAG }}
diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml
@@ -39,16 +39,16 @@ stages:
           REGISTRY_NAME: '$(ACR_REGISTRY_NAME).azurecr.io'
           TAG: ':$(Build.BuildId)'
         steps:
-          - task: DockerCompose@1
+          - task: DockerCompose@0
             displayName: Pull Presidio Images from ACR
             inputs:
               action: Run a Docker Compose command
               projectName: 'microsoft_presidio'
               dockerComposeCommand: pull
               dockerComposeFile: docker-compose.yml
-              containerregistrytype: 'Azure Container Registry'
-              azureSubscriptionEndpoint: 'bcb257e6-1ea3-45cd-9a11-a4e26dcff645'
-              azureContainerRegistry: $(REGISTRY_NAME)
+              containerregistrytype: Azure Container Registry
+              azureSubscriptionEndpoint: $(ACR_AZURE_SUBSCRIPTION)
+              azureContainerRegistry: '$(ACR_REGISTRY_NAME).azurecr.io'
               dockerComposeFileArgs: |
                 REGISTRY_NAME=$(REGISTRY_NAME)
                 TAG=$(TAG)