Merge pull request #1376 from camptocamp/backport/1373-to-prod-2-7-ad…

…vance

[Backport prod-2-7-advance] [Backport prod-2-7] Use Docker Compose version 2

.github/workflows/test.yaml

@@ -38,7 +38,7 @@ jobs:
       - run: cp docker-compose.override.acceptance-test.yaml docker-compose.override.yaml
 
       - name: Build
-        run: ./build
+        run: ./build --docker-compose-version-2
 
       - run: make acceptance-init
       - run: c2cciutils-docker-logs

Makefile

@@ -42,7 +42,7 @@ acceptance-init:
 	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-version-2 --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

ci/docker-compose-check

@@ -7,7 +7,7 @@ import sys
 def _main() -> None:
     services = [
         s.strip()
-        for s in subprocess.run(["docker-compose", "ps"], check=True, stdout=subprocess.PIPE)
+        for s in subprocess.run(["docker", "compose", "ps"], check=True, stdout=subprocess.PIPE)
         .stdout.decode("utf-8")
         .splitlines()
     ]

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