Upgrade to 2.8.1.126

camptocamp · Aug 6, 2024 · 2f3e10d · 2f3e10d
1 parent aa7f5cf
commit 2f3e10d
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 18 deletions.
diff --git a/CONST_create_template/env.default b/CONST_create_template/env.default
@@ -1,5 +1,5 @@
 # Default values for c2cgeoportal
-GEOMAPFISH_VERSION=2.8.1.125
+GEOMAPFISH_VERSION=2.8.1.126
 GEOMAPFISH_MAIN_VERSION=2.8
 GEOMAPFISH_MAIN_MINOR_VERSION=2.8.1
 COMPOSE_PROJECT_NAME=geomapfish

diff --git a/CONST_create_template/scripts/db-backup b/CONST_create_template/scripts/db-backup
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2021-2023, Camptocamp SA
+# Copyright (c) 2021-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -47,6 +47,9 @@ def main() -> None:
         default=[],
         help="Additional pg_dump argument, example: '--arg=--schema=main', may be used multiple times.",
     )
+    parser.add_argument(
+        "--docker-compose-version-2", action="store_true", help="Use Docker Compose version 2"
+    )
     parser.add_argument("file", help="The file path to backup")
     args = parser.parse_args()
 
@@ -89,15 +92,15 @@ def main() -> None:
         else:
             subprocess.run(
                 [
-                    "docker-compose",
+                    *(["docker", "compose"] if args.docker_compose_version_2 else ["docker-compose"]),
                     "exec",
                     "-T",
                     "tools",
                     "bash",
                     "-c",
                     'pg_dump --format=c --dbname="$PGDATABASE"',
-                ]
-                + args.arg,
+                    *args.arg,
+                ],
                 stdout=file_out,
                 check=True,
             )

diff --git a/CONST_create_template/scripts/db-restore b/CONST_create_template/scripts/db-restore
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2021-2023, Camptocamp SA
+# Copyright (c) 2021-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -51,6 +51,9 @@ def main() -> None:
         default=[],
         help="Additional pg_restore argument, example: '--arg=--schema=main', may be used multiple times.",
     )
+    parser.add_argument(
+        "--docker-compose-version-2", action="store_true", help="Use Docker Compose version 2"
+    )
     parser.add_argument("file", help="The file path to restore")
     args = parser.parse_args()
 
@@ -92,9 +95,9 @@ def main() -> None:
             )
         else:
             subprocess.run(
-                ["docker-compose"]
-                + ["--file={}".format(f) for f in args.docker_compose_file]
-                + [
+                [
+                    *(["docker", "compose"] if args.docker_compose_version_2 else ["docker-compose"]),
+                    *("--file={}".format(f) for f in args.docker_compose_file),
                     "exec",
                     "-T",
                     "tools",

diff --git a/env.default b/env.default
@@ -1,5 +1,5 @@
 # Default values for c2cgeoportal
-GEOMAPFISH_VERSION=2.8.1.125
+GEOMAPFISH_VERSION=2.8.1.126
 GEOMAPFISH_MAIN_VERSION=2.8
 GEOMAPFISH_MAIN_MINOR_VERSION=2.8.1
 COMPOSE_PROJECT_NAME=geomapfish

diff --git a/scripts/db-backup b/scripts/db-backup
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2021-2023, Camptocamp SA
+# Copyright (c) 2021-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -47,6 +47,9 @@ def main() -> None:
         default=[],
         help="Additional pg_dump argument, example: '--arg=--schema=main', may be used multiple times.",
     )
+    parser.add_argument(
+        "--docker-compose-version-2", action="store_true", help="Use Docker Compose version 2"
+    )
     parser.add_argument("file", help="The file path to backup")
     args = parser.parse_args()
 
@@ -89,15 +92,15 @@ def main() -> None:
         else:
             subprocess.run(
                 [
-                    "docker-compose",
+                    *(["docker", "compose"] if args.docker_compose_version_2 else ["docker-compose"]),
                     "exec",
                     "-T",
                     "tools",
                     "bash",
                     "-c",
                     'pg_dump --format=c --dbname="$PGDATABASE"',
-                ]
-                + args.arg,
+                    *args.arg,
+                ],
                 stdout=file_out,
                 check=True,
             )

diff --git a/scripts/db-restore b/scripts/db-restore
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2021-2023, Camptocamp SA
+# Copyright (c) 2021-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -51,6 +51,9 @@ def main() -> None:
         default=[],
         help="Additional pg_restore argument, example: '--arg=--schema=main', may be used multiple times.",
     )
+    parser.add_argument(
+        "--docker-compose-version-2", action="store_true", help="Use Docker Compose version 2"
+    )
     parser.add_argument("file", help="The file path to restore")
     args = parser.parse_args()
 
@@ -92,9 +95,9 @@ def main() -> None:
             )
         else:
             subprocess.run(
-                ["docker-compose"]
-                + ["--file={}".format(f) for f in args.docker_compose_file]
-                + [
+                [
+                    *(["docker", "compose"] if args.docker_compose_version_2 else ["docker-compose"]),
+                    *("--file={}".format(f) for f in args.docker_compose_file),
                     "exec",
                     "-T",
                     "tools",