From a83c94bbf2aef2a8cec2937116be9e7aba299081 Mon Sep 17 00:00:00 2001 From: Jonathan Lermitage Date: Fri, 22 Nov 2024 16:35:31 +0100 Subject: [PATCH] fix azure pipeline --- azure-pipelines.yml | 2 +- docker/docker-compose-test-azure.yml | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 559c7752..7f3bb3b1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,7 +20,7 @@ steps: - script: echo '##vso[task.setvariable variable=MANON_TEST_REDIS_PORT]6380' - script: sudo /etc/init.d/mysql stop - script: sudo netstat -antp - - task: DockerCompose@1 + - task: DockerCompose@1 # https://learn.microsoft.com/en-us/azure/devops/pipelines/tasks/reference/docker-compose-v1?view=azure-pipelines inputs: containerregistrytype: 'Azure Container Registry' dockerComposeFile: './docker/docker-compose-test-azure.yml' diff --git a/docker/docker-compose-test-azure.yml b/docker/docker-compose-test-azure.yml index 38012533..c40ba4b6 100644 --- a/docker/docker-compose-test-azure.yml +++ b/docker/docker-compose-test-azure.yml @@ -1,10 +1,8 @@ -version: '3.4' - services: maria-test: container_name: maria-test - image: mariadb:10.10.2 # see https://hub.docker.com/_/mariadb/ + image: postgres:15.1 # see https://hub.docker.com/_/mariadb/ ports: - "3307:3306" environment: @@ -13,7 +11,7 @@ services: maria-batch-test: container_name: maria-batch-test - image: mariadb:10.10.2 # see https://hub.docker.com/_/mariadb/ + image: postgres:15.1 # see https://hub.docker.com/_/mariadb/ ports: - "3308:3306" environment: