Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CI due to DockerCompose project name issue #1428

Merged
merged 15 commits into from
Aug 4, 2024
3 changes: 3 additions & 0 deletions .pipelines/templates/build-and-push-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,16 @@ steps:
REGISTRY_NAME=${{ parameters.REGISTRY_NAME }}
IMAGE_PREFIX=${{ parameters.IMAGE_PREFIX }}
TAG=${{ parameters.TAG }}
projectName: 'microsoft_presidio'

- task: DockerCompose@0
displayName: Push Presidio Images to ACR
inputs:
action: 'Push services'
dockerComposeFile: ${{ parameters.DOCKER_COMPOSE_FILE }}
containerregistrytype: 'Container Registry'
dockerRegistryEndpoint: 'presidio-acr'
projectName: 'microsoft_presidio'
dockerComposeFileArgs: |
REGISTRY_NAME=${{ parameters.REGISTRY_NAME }}
IMAGE_PREFIX=${{ parameters.IMAGE_PREFIX }}
Expand Down
4 changes: 3 additions & 1 deletion .pipelines/templates/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ steps:
displayName: Start Presidio Cluster
inputs:
action: Run services
projectName: 'microsoft_presidio'
dockerComposeFile: docker-compose.yml
buildImages: false
# Start cluster when testing against remote cluster, when an external url is not provided.
condition: eq('${{ parameters.anonymizer_base_url }}', '')

- task: UsePythonVersion@0
inputs:
versionSpec: '3.9'
Expand Down Expand Up @@ -49,6 +50,7 @@ steps:
- task: DockerCompose@0
displayName: Docker Logs
inputs:
projectName: 'microsoft_presidio'
dockerComposeCommand: logs
dockerComposeFile: docker-compose.yml
buildImages: false
Expand Down
1 change: 1 addition & 0 deletions .pipelines/templates/test-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ steps:
displayName: 'Run service with docker compose'
inputs:
containerregistrytype: 'Azure Container Registry'
projectName: 'microsoft_presidio'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run services'

Expand Down
1 change: 1 addition & 0 deletions azure-pipelines-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ stages:
displayName: Pull Presidio Images from ACR
inputs:
action: Run a Docker Compose command
projectName: 'microsoft_presidio'
dockerComposeCommand: pull
dockerComposeFile: docker-compose.yml
containerregistrytype: 'Container Registry'
Expand Down
2 changes: 2 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ stages:
steps:
- task: DockerCompose@0
displayName: Build Presidio Images

inputs:
action: Build services
projectName: 'microsoft_presidio'
dockerComposeFile: docker-compose.yml
dockerComposeFileArgs: |
REGISTRY_NAME=$(REGISTRY_NAME)
Expand Down
Loading