Use Docker Compose version 2

camptocamp · Aug 6, 2024 · 0b5c56e · 0b5c56e
1 parent 73f7902
commit 0b5c56e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -60,7 +60,7 @@ jobs:
       - name: Docker compose logs
         run: |
           c2cciutils-docker-logs
-          docker-compose down -v --remove-orphans
+          docker compose down -v --remove-orphans
         if: always()
       - uses: camptocamp/initialise-gopass-summon-action@v2
         with:

diff --git a/Makefile b/Makefile
@@ -52,12 +52,12 @@ test: test_c2cgeoform test_c2cgeoform_demo
 
 .PHONY: test_c2cgeoform
 test_c2cgeoform: build poetry
-	docker-compose up -d db
+	docker compose up -d db
 	poetry run pytest -vvv
 
 .PHONY: test_c2cgeoform_demo
 test_c2cgeoform_demo: $(BUILD_DIR)/c2cgeoform_demo
-	docker-compose up -d db
+	docker compose up -d db
 	make -C $(BUILD_DIR)/c2cgeoform_demo -f ./dev.mk test
 
 $(BUILD_DIR)/c2cgeoform_demo: build c2cgeoform/scaffolds/c2cgeoform c2cgeoform_demo_dev.mk
@@ -101,7 +101,7 @@ cleanall: clean
 
 .PHONY: initdb
 initdb: $(BUILD_DIR)/c2cgeoform_demo
-	docker-compose up -d db
+	docker compose up -d db
 	sleep 1
 	make -C $(BUILD_DIR)/c2cgeoform_demo -f dev.mk initdb
 
@@ -111,7 +111,7 @@ webpack-dev:
 
 .PHONY: serve
 serve: build $(BUILD_DIR)/c2cgeoform_demo
-	docker-compose up -d db
+	docker compose up -d db
 	make -C $(BUILD_DIR)/c2cgeoform_demo -f dev.mk serve
 
 .PHONY: modwsgi