From ab4c2e372af59b956a2cbc34ead133071e1280a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Fri, 14 Jun 2024 08:28:29 +0200 Subject: [PATCH] Use Docker compose version 2 --- .github/workflows/rebuild.yaml | 4 ++-- Makefile | 12 ++++++------ README.md | 2 +- acceptance_tests/docker-compose.yaml | 2 -- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/rebuild.yaml b/.github/workflows/rebuild.yaml index 72d005b8..cfe6bb55 100644 --- a/.github/workflows/rebuild.yaml +++ b/.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 diff --git a/Makefile b/Makefile index ca84528e..6175a596 100644 --- a/Makefile +++ b/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 diff --git a/README.md b/README.md index 27574646..71302f1f 100644 --- a/README.md +++ b/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) diff --git a/acceptance_tests/docker-compose.yaml b/acceptance_tests/docker-compose.yaml index de15cfa0..5c31ad4b 100644 --- a/acceptance_tests/docker-compose.yaml +++ b/acceptance_tests/docker-compose.yaml @@ -1,5 +1,3 @@ -version: '2' - volumes: cache: tmp: