From 488170afb36b62b47064bd53cdc85e1d4279d881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Tue, 6 Aug 2024 17:19:42 +0200 Subject: [PATCH] Use Docker Compose version 2 --- Makefile | 6 +++--- custom/custom/alembic/env.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 15937bbb9..cd169f2df 100644 --- a/Makefile +++ b/Makefile @@ -27,14 +27,14 @@ checks: prospector eslint ## Runs the checks .PHONY: prospector prospector: ## Runs the Prospector checks - docker-compose run --entrypoint= --no-deps --rm --volume=$(CURDIR)/geoportal:/app geoportal \ + docker compose run --entrypoint= --rm --volume=$(CURDIR)/geoportal:/app geoportal \ prospector --output-format=pylint --die-on-tool-error .PHONY: eslint eslint: ## Runs the eslint checks - docker compose run --entrypoint= --no-deps --rm --volume=$(CURDIR)/geoportal:/app geoportal \ + docker compose run --entrypoint= --rm --volume=$(CURDIR)/geoportal:/app geoportal \ eslint $(find geomapfish -type f -name '*.js' -print 2> /dev/null) - docker compose run --entrypoint= --no-deps --rm --volume=$(CURDIR)/geoportal:/app geoportal \ + docker compose run --entrypoint= --rm --volume=$(CURDIR)/geoportal:/app geoportal \ eslint $(find geomapfish -type f -name '*.ts' -print 2> /dev/null) .PHONY: build diff --git a/custom/custom/alembic/env.py b/custom/custom/alembic/env.py index 9340b4f0f..75f18d185 100644 --- a/custom/custom/alembic/env.py +++ b/custom/custom/alembic/env.py @@ -1,4 +1,5 @@ """Pyramid bootstrap environment. """ + from alembic import context from custom.models.meta import Base from pyramid.paster import get_appsettings, setup_logging