From d7c2fb066670ebcd8773b1f48d9f0cd7f478e766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Fri, 9 Aug 2024 08:48:07 +0200 Subject: [PATCH] Use Docker Compose version 2 --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 1e7e0b15..515a4f0c 100644 --- a/Makefile +++ b/Makefile @@ -47,22 +47,22 @@ build-acceptance: acceptance: build-acceptance build # Run the acceptance tests C2C_AUTH_GITHUB_CLIENT_ID=$(shell gopass show gs/projects/github/oauth-apps/geoservices-int/client-id) \ C2C_AUTH_GITHUB_CLIENT_SECRET=$(shell gopass show gs/projects/github/oauth-apps/geoservices-int/client-secret) \ - docker-compose up --detach - docker-compose exec -T tests pytest -vv --color=yes --junitxml /reports/acceptance.xml acceptance - docker-compose down + docker compose up --detach + docker compose exec -T tests pytest -vv --color=yes --junitxml /reports/acceptance.xml acceptance + docker compose down .PHONY: run run: build - docker-compose stop - docker-compose rm --force + docker compose stop + docker compose rm --force C2C_AUTH_GITHUB_CLIENT_ID=$(shell gopass show gs/projects/github/oauth-apps/geoservices-int/client-id) \ C2C_AUTH_GITHUB_CLIENT_SECRET=$(shell gopass show gs/projects/github/oauth-apps/geoservices-int/client-secret) \ - docker-compose up --detach + docker compose up --detach .PHONY: clean clean: rm -rf reports .venv - docker-compose down + docker compose down .PHONY: checks checks: prospector acceptance-prospector ## Run the checks