Upgrade to 2.9.rc.4

camptocamp · Nov 12, 2024 · cc7f469 · cc7f469
1 parent 6087353
commit cc7f469
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 5 deletions.
diff --git a/CONST_create_template/docker-compose.override.sample.yaml b/CONST_create_template/docker-compose.override.sample.yaml
@@ -22,6 +22,7 @@ services:
       # - PRINT_URL=http://print:8080/print/
       - PYTHONWARNINGS=default::DeprecationWarning
       - SQLALCHEMY_WARN_20=true
+      - C2CWSGIUTILS_FORCE_PROTO=https
     ports:
       - 5678:5678 # For remote debugging using Visual Studio Code
 

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.9.rc.3
+GEOMAPFISH_VERSION=2.9.rc.4
 GEOMAPFISH_MAIN_VERSION=2.9
 GEOMAPFISH_MAIN_MINOR_VERSION=2.9.0
 COMPOSE_PROJECT_NAME=geomapfish

diff --git a/CONST_create_template/geoportal/webpack.apps.js b/CONST_create_template/geoportal/webpack.apps.js
@@ -23,7 +23,7 @@ for (const filename of ls(
       chunks: [name],
       vars: {
         entry_point: '${VISIBLE_ENTRY_POINT}',
-        version: '2.9.rc.3',
+        version: '2.9.rc.4',
         cache_version: '${CACHE_VERSION}',
       },
     })

diff --git a/CONST_create_template/tests/test_testapp.py b/CONST_create_template/tests/test_testapp.py
@@ -34,7 +34,7 @@ def test_desktop_alt(url: str) -> None:
     assert response.status_code == 200, response.text
 
     assert re.search(
-        r'<script src="https?://front/static-ngeo-dist/desktop-.*\.js" crossorigin="anonymous"></script>',
+        r'<script src="https://front/static-ngeo-dist/desktop-.*\.js" crossorigin="anonymous"></script>',
         response.text,
     ), response.text
     assert re.search(r'<html lang="{{mainCtrl.lang}}" ', response.text), response.text

diff --git a/docker-compose.override.sample.yaml b/docker-compose.override.sample.yaml
@@ -33,6 +33,7 @@ services:
       # - PRINT_URL=http://print:8080/print/
       - PYTHONWARNINGS=default::DeprecationWarning
       - SQLALCHEMY_WARN_20=true
+      - C2CWSGIUTILS_FORCE_PROTO=https
     ports:
       - 5678:5678 # For remote debugging using Visual Studio Code
 

diff --git a/env.default b/env.default
@@ -1,5 +1,5 @@
 # Default values for c2cgeoportal
-GEOMAPFISH_VERSION=2.9.rc.3
+GEOMAPFISH_VERSION=2.9.rc.4
 GEOMAPFISH_MAIN_VERSION=2.9
 GEOMAPFISH_MAIN_MINOR_VERSION=2.9.0
 COMPOSE_PROJECT_NAME=geomapfish

diff --git a/geoportal/webpack.apps.js b/geoportal/webpack.apps.js
@@ -23,7 +23,7 @@ for (const filename of ls(
       chunks: [name],
       vars: {
         entry_point: '${VISIBLE_ENTRY_POINT}',
-        version: '2.9.rc.3',
+        version: '2.9.rc.4',
         cache_version: '${CACHE_VERSION}',
       },
     })