From bfa5b38ed65b8d2f48a9b8f5946dee51740f59e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Fri, 28 Jun 2024 12:47:31 +0200 Subject: [PATCH] Fix partially use docker compose v2 --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5196a4272..742b4c67c 100644 --- a/Makefile +++ b/Makefile @@ -33,16 +33,16 @@ secrets: .PHONY: qgis qgis: ## Run QGIS desktop - docker compose -f docker compose.yaml -f docker compose-qgis.yaml run --rm qgis + docker compose -f docker-compose.yaml -f docker-compose-qgis.yaml run --rm qgis .PHONY: acceptance-init acceptance-init: - docker compose --file=docker compose.yaml --file=docker compose-db.yaml up -d + docker compose --file=docker-compose.yaml --file=docker-compose-db.yaml up -d docker compose exec -T geoportal wait-db docker compose exec -T tools psql --command='CREATE EXTENSION IF NOT EXISTS postgis' docker compose exec -T tools psql --command='CREATE EXTENSION IF NOT EXISTS pg_trgm' docker compose exec -T tools psql --command='CREATE EXTENSION IF NOT EXISTS hstore' - scripts/db-restore --docker compose-file=docker compose.yaml --docker compose-file=docker compose-db.yaml \ + scripts/db-restore --docker compose-file=docker-compose.yaml --docker compose-file=docker-compose-db.yaml \ --arg=--clean --arg=--if-exists --arg=--verbose data/prod-2-7.dump docker compose restart geoportal alembic docker compose exec -T geoportal wait-db @@ -53,6 +53,6 @@ acceptance: ci/docker compose-check acceptance-dev: - docker compose --file=docker compose.yaml --file=docker compose-db.yaml --file=docker compose.override.sample.yaml up -d + docker compose --file=docker-compose.yaml --file=docker-compose-db.yaml --file=docker-compose.override.sample.yaml up -d docker compose exec -T tools pytest tests/ ci/docker compose-check