From 0a8c107becb0d5751cd6d469452dc26e263f55f1 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 --- .github/workflows/rebuild.yaml | 2 +- Makefile | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/rebuild.yaml b/.github/workflows/rebuild.yaml index db86be26..53a752a5 100644 --- 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 index 104d5801..237f31af 100644 --- 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)