Upgrade to 2.7.1.1

camptocamp · Oct 27, 2023 · f6a4a34 · f6a4a34
1 parent 4356ae8
commit f6a4a34
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/CONST_CHANGELOG.txt b/CONST_CHANGELOG.txt
@@ -1,6 +1,20 @@
 This file includes migration steps for each release of c2cgeoportal.
 
 
+=============
+Version 2.7.1
+=============
+
+1. Update dependencies to use GDAL 3.7
+
+   Use MapServer 7.6 with GDAL 3.7 (instead of 3.3) with new Ubuntu version
+   Use QGIS server 3.28 (instead of 3.22) with GDAL 3.7
+   Update rasterio to 1.3.9 (instead of 1.2.10)
+   Use GDAL 3.7 as based image with new Ubuntu version (Python 3.8 => 3.10)
+   Downgrade PyYAML to version 5.3.1 (instead of 5.4.1)
+   Downgrade transifex-client to version 0.12.5 (instead of 0.14.4)
+
+
 =============
 Version 2.7.0
 =============

diff --git a/CONST_create_template/docker-compose-lib.yaml b/CONST_create_template/docker-compose-lib.yaml
@@ -74,7 +74,7 @@ services:
       - PGOPTIONS
 
   mapserver:
-    image: camptocamp/mapserver:7.6-gdal3.3
+    image: camptocamp/mapserver:7.6-gdal3.7
     user: www-data
     restart: unless-stopped
     entrypoint: []

diff --git a/CONST_create_template/env.default b/CONST_create_template/env.default
@@ -1,7 +1,7 @@
 # Default values for c2cgeoportal
-GEOMAPFISH_VERSION=2.7.0.316
+GEOMAPFISH_VERSION=2.7.1.1
 GEOMAPFISH_MAIN_VERSION=2.7
-GEOMAPFISH_MAIN_MINOR_VERSION=2.7.0
+GEOMAPFISH_MAIN_MINOR_VERSION=2.7.1
 COMPOSE_PROJECT_NAME=geomapfish
 PACKAGE=geomapfish
 SRID=2056
@@ -41,7 +41,7 @@ TILECLOUDCHAIN_INTERNAL_PORT=8080
 MAPSERVER_URL=http://mapserver:8080/
 TINYOWS_URL=http://tinyows:8080/
 QGISSERVER_URL=http://qgisserver:8080/mapserv_proxy
-QGIS_VERSION=3.22
+QGIS_VERSION=3.28-gdal3.7
 POSTGRES_TAG=13-postgis-3
 
 DEVSERVER_HOST=webpack_dev_server:8080

diff --git a/docker-compose-lib.yaml b/docker-compose-lib.yaml
@@ -74,7 +74,7 @@ services:
       - PGOPTIONS
 
   mapserver:
-    image: camptocamp/mapserver:7.6-gdal3.3
+    image: camptocamp/mapserver:7.6-gdal3.7
     user: www-data
     restart: unless-stopped
     entrypoint: []

diff --git a/env.default b/env.default
@@ -1,7 +1,7 @@
 # Default values for c2cgeoportal
-GEOMAPFISH_VERSION=2.7.0.316
+GEOMAPFISH_VERSION=2.7.1.1
 GEOMAPFISH_MAIN_VERSION=2.7
-GEOMAPFISH_MAIN_MINOR_VERSION=2.7.0
+GEOMAPFISH_MAIN_MINOR_VERSION=2.7.1
 COMPOSE_PROJECT_NAME=geomapfish
 PACKAGE=geomapfish
 SRID=2056
@@ -41,7 +41,7 @@ TILECLOUDCHAIN_INTERNAL_PORT=8080
 MAPSERVER_URL=http://mapserver:8080/
 TINYOWS_URL=http://tinyows:8080/
 QGISSERVER_URL=http://qgisserver:8080/mapserv_proxy
-QGIS_VERSION=3.22
+QGIS_VERSION=3.28-gdal3.7
 POSTGRES_TAG=13-postgis-3
 
 DEVSERVER_HOST=webpack_dev_server:8080