From fc98f978d1d348eae2624a250bf3b8413f5ef253 Mon Sep 17 00:00:00 2001 From: Sharon Hart Date: Mon, 5 Jun 2023 12:57:37 +0300 Subject: [PATCH 1/4] Update build-and-push-containers.yml --- .pipelines/templates/build-and-push-containers.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.pipelines/templates/build-and-push-containers.yml b/.pipelines/templates/build-and-push-containers.yml index 96ed72221..634a657bb 100644 --- a/.pipelines/templates/build-and-push-containers.yml +++ b/.pipelines/templates/build-and-push-containers.yml @@ -26,12 +26,13 @@ steps: - task: DockerCompose@0 displayName: Push Presidio Images to ACR inputs: - action: Push services - dockerComposeFile: ${{ parameters.DOCKER_COMPOSE_FILE }} - containerregistrytype: Azure Container Registry + action: 'Push services'@2 + dockerComposeFile: ${{ parameters.DOCKER_COMPOSE_FILE }} + containerregistrytype: 'Container Registry' + dockerRegistryEndpoint: 'presidio-acr' azureSubscriptionEndpoint: ${{ parameters.AZURE_SUBSCRIPTION }} azureContainerRegistry: ${{ parameters.REGISTRY_NAME }} dockerComposeFileArgs: | REGISTRY_NAME=${{ parameters.REGISTRY_NAME }} IMAGE_PREFIX=${{ parameters.IMAGE_PREFIX }} - TAG=${{ parameters.TAG }} \ No newline at end of file + TAG=${{ parameters.TAG }} From ec953d634b7f4bebd84b30d294c78d8e261e8de0 Mon Sep 17 00:00:00 2001 From: Sharon Hart Date: Mon, 5 Jun 2023 13:03:25 +0300 Subject: [PATCH 2/4] Update build-and-push-containers.yml --- .pipelines/templates/build-and-push-containers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/templates/build-and-push-containers.yml b/.pipelines/templates/build-and-push-containers.yml index 634a657bb..231278112 100644 --- a/.pipelines/templates/build-and-push-containers.yml +++ b/.pipelines/templates/build-and-push-containers.yml @@ -26,7 +26,7 @@ steps: - task: DockerCompose@0 displayName: Push Presidio Images to ACR inputs: - action: 'Push services'@2 + action: 'Push services' dockerComposeFile: ${{ parameters.DOCKER_COMPOSE_FILE }} containerregistrytype: 'Container Registry' dockerRegistryEndpoint: 'presidio-acr' From 7f0a6ade2a241632b0dc180e0318bd38f643de6a Mon Sep 17 00:00:00 2001 From: Sharon Hart Date: Mon, 5 Jun 2023 13:14:34 +0300 Subject: [PATCH 3/4] Update build-and-push-containers.yml --- .pipelines/templates/build-and-push-containers.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.pipelines/templates/build-and-push-containers.yml b/.pipelines/templates/build-and-push-containers.yml index 231278112..41b7da299 100644 --- a/.pipelines/templates/build-and-push-containers.yml +++ b/.pipelines/templates/build-and-push-containers.yml @@ -30,8 +30,6 @@ steps: dockerComposeFile: ${{ parameters.DOCKER_COMPOSE_FILE }} containerregistrytype: 'Container Registry' dockerRegistryEndpoint: 'presidio-acr' - azureSubscriptionEndpoint: ${{ parameters.AZURE_SUBSCRIPTION }} - azureContainerRegistry: ${{ parameters.REGISTRY_NAME }} dockerComposeFileArgs: | REGISTRY_NAME=${{ parameters.REGISTRY_NAME }} IMAGE_PREFIX=${{ parameters.IMAGE_PREFIX }} From b62d57bccfe459cc7ad874dda7864158100e7aa6 Mon Sep 17 00:00:00 2001 From: Sharon Hart Date: Mon, 5 Jun 2023 13:19:03 +0300 Subject: [PATCH 4/4] Update azure-pipelines-ci.yml --- azure-pipelines-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml index 9cd19d161..08a55230b 100644 --- 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)