fix azure pipeline

jonathanlermitage · Nov 22, 2024 · 16fb6dc · 16fb6dc
1 parent 76a3e61
commit 16fb6dc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -20,19 +20,18 @@ steps:
   - script: echo '##vso[task.setvariable variable=MANON_TEST_REDIS_PORT]6380'
   - script: sudo /etc/init.d/mysql stop
   - script: sudo netstat -antp
-  - script: docker-compose --version
-  - task: DockerCompose@0
+  - task: DockerCompose@1 # https://learn.microsoft.com/en-us/azure/devops/pipelines/tasks/reference/docker-compose-v1?view=azure-pipelines
     inputs:
-      containerregistrytype: 'Container Registry'
+      containerregistrytype: 'Azure Container Registry'
       dockerComposeFile: './docker/docker-compose-test-azure.yml'
       action: 'Run a Docker Compose command'
       dockerComposeCommand: 'up -d'
+      projectName: 'manon_prj_for_azure'
   - script: sleep 15
   - script: sudo netstat -antp
-  - script: cd docker && docker-compose ps && cd ..
   - script: mysql --user=root --password=woot --host=127.0.0.1 --port=3307 --execute="show databases;"
   - script: mysql --user=root --password=woot --host=127.0.0.1 --port=3308 --execute="show databases;"
-  - task: Maven@3 # see help https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/build/maven?view=azure-devops
+  - task: Maven@4 # see help https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/build/maven?view=azure-devops
     inputs:
       mavenPomFile: 'pom.xml'
       javaHomeOption: 'JDKVersion'

diff --git a/docker/docker-compose-test-azure.yml b/docker/docker-compose-test-azure.yml
@@ -1,10 +1,8 @@
-version: '3.4'
-# FIXME (specific to MS Azure pipeline) Can't connect to MariaDB 10.3.18, so I downgraded to 10.7.4. Still investigating this issue.
 services:
 
   maria-test:
     container_name: maria-test
-    image: mariadb:10.10.2 # see https://hub.docker.com/_/mariadb/
+    image: mariadb:11.5.2 # 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: mariadb:11.5.2 # see https://hub.docker.com/_/mariadb/
     ports:
       - "3308:3306"
     environment: