From f6a4a340110c89d024b4766068685b2be62a4ae3 Mon Sep 17 00:00:00 2001 From: Continuous integration Date: Fri, 27 Oct 2023 08:54:52 +0000 Subject: [PATCH] Upgrade to 2.7.1.1 --- CONST_CHANGELOG.txt | 14 ++++++++++++++ CONST_create_template/docker-compose-lib.yaml | 2 +- CONST_create_template/env.default | 6 +++--- docker-compose-lib.yaml | 2 +- env.default | 6 +++--- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/CONST_CHANGELOG.txt b/CONST_CHANGELOG.txt index 1c57f050a..f1d4149a9 100644 --- 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 index c2fd527ef..6f8eeb91b 100644 --- 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 index 3a3a3dd3e..918b25925 100644 --- 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 index c2fd527ef..6f8eeb91b 100644 --- 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 index 3a3a3dd3e..918b25925 100644 --- 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