From b8be6a1b761bb3b15f5e68ed7fc9dcc69839fae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Thu, 8 Aug 2024 11:57:44 +0200 Subject: [PATCH] Use Docker Compose version 2 --- Makefile | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index a594b2aa..7616f841 100644 --- 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,9 +28,9 @@ build: .PHONY: acceptance acceptance: build - (cd acceptance_tests/ && docker-compose up -d) - (cd acceptance_tests/ && docker-compose exec -T acceptance bash -c 'cd /acceptance_tests ; py.test -vv --color=yes --junitxml /tmp/junitxml/results.xml') - (cd acceptance_tests/ && docker-compose down) + (cd acceptance_tests/ && docker compose up -d) + (cd acceptance_tests/ && docker compose exec -T acceptance bash -c 'cd /acceptance_tests ; py.test -vv --color=yes --junitxml /tmp/junitxml/results.xml') + (cd acceptance_tests/ && docker compose down) .PHONY: clean clean: