Use Docker Compose version 2

camptocamp · Aug 9, 2024 · cfbc036 · cfbc036
1 parent 8de3cb6
commit cfbc036
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git 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

diff --git a/ci/requirements.txt b/ci/requirements.txt
@@ -1,4 +1,4 @@
-c2cciutils[checks,publish]==1.4.13
+c2cciutils[checks,publish]==1.4.19
 setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
 certifi>=2022.12.7 # not directly required, pinned by Snyk to avoid a vulnerability
 cryptography>=39.0.1 # not directly required, pinned by Snyk to avoid a vulnerability