From f55b434f6721ce0b01d676c445d2c460d0194227 Mon Sep 17 00:00:00 2001 From: Sharon Hart Date: Thu, 14 Nov 2024 19:50:41 +0200 Subject: [PATCH] test --- .pipelines/templates/build-and-push-containers.yml | 11 ++++++----- azure-pipelines-ci.yml | 8 ++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.pipelines/templates/build-and-push-containers.yml b/.pipelines/templates/build-and-push-containers.yml index e920f728f..305aad141 100644 --- 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 index f1a34c540..3e6e64651 100644 --- 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)