Use Docker Compose version 2

camptocamp · Aug 8, 2024 · 050f01a · 050f01a
1 parent 9ce25db
commit 050f01a
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -14,13 +14,7 @@ else
 DOCKER_VERSION = $(DOCKER_VERSION_ACTUAL)
 endif
 
-#Get the docker-compose version (must use the same version for acceptance tests)
-DOCKER_COMPOSE_VERSION_ACTUAL = $(shell docker-compose version --short)
-ifeq ($(DOCKER_COMPOSE_VERSION_ACTUAL),)
-DOCKER_COMPOSE_VERSION = 1.8.0
-else
-DOCKER_COMPOSE_VERSION = $(DOCKER_COMPOSE_VERSION_ACTUAL)
-endif
+DOCKER_COMPOSE_VERSION = 1.29.2
 
 all: acceptance
 
@@ -34,8 +28,8 @@ build:
 
 .PHONY: acceptance
 acceptance: build
-	(cd acceptance_tests/ && docker-compose down)
-	(cd acceptance_tests/ && docker-compose build)
-	(cd acceptance_tests/ && docker-compose up -d)
-	(cd acceptance_tests/ && docker-compose exec -T acceptance py.test -vv --color=yes --junitxml /tmp/junitxml/results.xml)
-	(cd acceptance_tests/ && docker-compose down)
+	(cd acceptance_tests/ && docker compose down)
+	(cd acceptance_tests/ && docker compose build)
+	(cd acceptance_tests/ && docker compose up -d)
+	(cd acceptance_tests/ && docker compose exec -T acceptance py.test -vv --color=yes --junitxml /tmp/junitxml/results.xml)
+	(cd acceptance_tests/ && docker compose down)