Use Docker Compose version 2

camptocamp · Aug 8, 2024 · 0a8c107 · 0a8c107
1 parent 8b5f7a5
commit 0a8c107
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/rebuild.yaml b/.github/workflows/rebuild.yaml
@@ -43,7 +43,7 @@ jobs:
 
       - run: make build
       - 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: Set up QEMU

diff --git a/Makefile b/Makefile
@@ -28,12 +28,12 @@ build-no-cache: ## Build the Docker image (no cache)
 
 .PHONY: acceptance
 acceptance: build ## Run the acceptance tests
-	(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)
 
 .PHONY: run
 run: build
-	(cd acceptance_tests; docker-compose up -d)
+	(cd acceptance_tests; docker compose up -d)