From 0d526ae9b95482c093a0050a359d8466182477ff Mon Sep 17 00:00:00 2001 From: Continuous integration Date: Thu, 26 Oct 2023 09:23:12 +0000 Subject: [PATCH] Upgrade to 2.8.1.1 --- CONST_CHANGELOG.txt | 9 +++++++++ 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, 17 insertions(+), 8 deletions(-) diff --git a/CONST_CHANGELOG.txt b/CONST_CHANGELOG.txt index e97d25ea9..f5d7b6257 100644 --- a/CONST_CHANGELOG.txt +++ b/CONST_CHANGELOG.txt @@ -1,5 +1,14 @@ This file includes migration steps for each release of c2cgeoportal. +============= +Version 2.8.1 +============= + +1. Update dependencies to use GDAL 3.7 + + Use MapServer 8.0 with GDAL 3.7 (instead of 3.6) + Use QGIS server 3.28 with GDAL 3.7 (instead of 3.6) + Use GDAL 3.7 as based image (instead of 3.6) ============= Version 2.8.0 diff --git a/CONST_create_template/docker-compose-lib.yaml b/CONST_create_template/docker-compose-lib.yaml index 34f0eb142..aab530803 100644 --- a/CONST_create_template/docker-compose-lib.yaml +++ b/CONST_create_template/docker-compose-lib.yaml @@ -77,7 +77,7 @@ services: - PGOPTIONS mapserver: - image: camptocamp/mapserver:8.0-gdal3.6 + image: camptocamp/mapserver:8.0-gdal3.7 user: www-data restart: unless-stopped entrypoint: [] diff --git a/CONST_create_template/env.default b/CONST_create_template/env.default index d1e6437ed..d80d7b5d8 100644 --- a/CONST_create_template/env.default +++ b/CONST_create_template/env.default @@ -1,7 +1,7 @@ # Default values for c2cgeoportal -GEOMAPFISH_VERSION=2.8.0.120 +GEOMAPFISH_VERSION=2.8.1.1 GEOMAPFISH_MAIN_VERSION=2.8 -GEOMAPFISH_MAIN_MINOR_VERSION=2.8.0 +GEOMAPFISH_MAIN_MINOR_VERSION=2.8.1 COMPOSE_PROJECT_NAME=geomapfish PACKAGE=geomapfish SRID=2056 @@ -46,7 +46,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.28-gdal3.6 +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 34f0eb142..aab530803 100644 --- a/docker-compose-lib.yaml +++ b/docker-compose-lib.yaml @@ -77,7 +77,7 @@ services: - PGOPTIONS mapserver: - image: camptocamp/mapserver:8.0-gdal3.6 + image: camptocamp/mapserver:8.0-gdal3.7 user: www-data restart: unless-stopped entrypoint: [] diff --git a/env.default b/env.default index d1e6437ed..d80d7b5d8 100644 --- a/env.default +++ b/env.default @@ -1,7 +1,7 @@ # Default values for c2cgeoportal -GEOMAPFISH_VERSION=2.8.0.120 +GEOMAPFISH_VERSION=2.8.1.1 GEOMAPFISH_MAIN_VERSION=2.8 -GEOMAPFISH_MAIN_MINOR_VERSION=2.8.0 +GEOMAPFISH_MAIN_MINOR_VERSION=2.8.1 COMPOSE_PROJECT_NAME=geomapfish PACKAGE=geomapfish SRID=2056 @@ -46,7 +46,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.28-gdal3.6 +QGIS_VERSION=3.28-gdal3.7 POSTGRES_TAG=13-postgis-3 DEVSERVER_HOST=webpack_dev_server:8080