Merge pull request #10678 from camptocamp/backport/10673-to-2.8

[Backport 2.8] Fix database initialization
camptocamp · Sep 22, 2023 · f307de0 · f307de0
2 parents 091f8d6 + 9d08557
commit f307de0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/.../c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-lib.yaml b/.../c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-lib.yaml
@@ -482,9 +482,6 @@ services:
   db:
     image: camptocamp/postgres:${POSTGRES_TAG}
     environment:
-      - PGUSER
-      - PGPASSWORD
-      - PGDATABASE
       - POSTGRES_PASSWORD=${PGPASSWORD}
       - POSTGRES_DB=${PGDATABASE}
       - POSTGRES_USER=${PGUSER}
diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-backup b/geoportal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-backup
@@ -92,7 +92,7 @@ def main() -> None:
                     "docker-compose",
                     "exec",
                     "-T",
-                    "db",
+                    "tools",
                     "bash",
                     "-c",
                     'pg_dump --format=c --dbname="$PGDATABASE"',

diff --git a/...ortal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-restore b/...ortal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-restore
@@ -97,7 +97,7 @@ def main() -> None:
                 + [
                     "exec",
                     "-T",
-                    "db",
+                    "tools",
                     "bash",
                     "-c",
                     'pg_restore --dbname="$PGDATABASE" ' + " ".join(args.arg),
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,7 +92,7 @@ def main() -> None: @@
                         "docker-compose",
                         "exec",
                         "-T",
-                        "db",
+                        "tools",
                         "bash",
                         "-c",
                         'pg_dump --format=c --dbname="$PGDATABASE"',
@@ Expand Down @@