Merge pull request #1096 from camptocamp/docker-compose

Use Docker compose version 2

.github/workflows/rebuild.yaml

@@ -76,10 +76,10 @@ jobs:
  docker stop cache
 
  - run: make run
- - run: (cd acceptance_tests && c2cciutils-docker-logs || docker-compose logs)
+ - run: (cd acceptance_tests && c2cciutils-docker-logs || docker compose logs)
  if: always()
  - run: make acceptance
- - run: (cd acceptance_tests && c2cciutils-docker-logs || docker-compose logs)
+ - run: (cd acceptance_tests && c2cciutils-docker-logs || docker compose logs)
  if: always()
 
  - name: Publish

Makefile

@@ -48,15 +48,15 @@ build-acceptance: build-acceptance-config
 .PHONY: run
 run: build-acceptance
  mkdir -p acceptance_tests/junitxml && touch acceptance_tests/junitxml/results.xml
- cd acceptance_tests; docker-compose up -d
+ cd acceptance_tests; docker compose up -d
 
 .PHONY: acceptance
 acceptance: run ## Run the acceptance tests
- cd acceptance_tests; docker-compose exec $(DOCKER_COMPOSE_TTY) run pytest -vv --color=yes --junitxml=/tmp/junitxml/results.xml
- cd acceptance_tests; docker-compose exec $(DOCKER_COMPOSE_TTY) qgis python3 -c 'from qgis import *'
- cd acceptance_tests; docker-compose exec $(DOCKER_COMPOSE_TTY) qgis python3 -c 'from qgis.core import *'
- cd acceptance_tests; docker-compose exec $(DOCKER_COMPOSE_TTY) qgis python3 -c 'from qgis.server import *'
- cd acceptance_tests; docker-compose exec $(DOCKER_COMPOSE_TTY) qgis python3 -c 'from qgis._gui import *'
+ cd acceptance_tests; docker compose exec $(DOCKER_COMPOSE_TTY) run pytest -vv --color=yes --junitxml=/tmp/junitxml/results.xml
+ cd acceptance_tests; docker compose exec $(DOCKER_COMPOSE_TTY) qgis python3 -c 'from qgis import *'
+ cd acceptance_tests; docker compose exec $(DOCKER_COMPOSE_TTY) qgis python3 -c 'from qgis.core import *'
+ cd acceptance_tests; docker compose exec $(DOCKER_COMPOSE_TTY) qgis python3 -c 'from qgis.server import *'
+ cd acceptance_tests; docker compose exec $(DOCKER_COMPOSE_TTY) qgis python3 -c 'from qgis._gui import *'
 
 .PHONY: run-client
 run-client: ## Run the desktop application

README.md

@@ -41,7 +41,7 @@ To get a good stack trace you should use the `-debug` image.
 
 Run the querty that makes the server crash, then:
 
-Open a bash as root on the container with something like: `docker-compose exec --user=root qgisserver bash`, then:
+Open a bash as root on the container with something like: `docker compose exec --user=root qgisserver bash`, then:
 
 ```bash
 CORE_FILENAME=$(ls -tr1 /tmp/|grep core|tail -n 1)

acceptance_tests/docker-compose.yaml

@@ -1,5 +1,3 @@
-version: '2'
-
 volumes:
  cache:
  tmp: