Skip to content

Commit

Permalink
Fix partially use docker compose v2
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrunner committed Jun 28, 2024
1 parent 6c17e0e commit 1040576
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

0 comments on commit 1040576

Please sign in to comment.