Upgrade to master

camptocamp · Jan 28, 2023 · 492df89 · 492df89
1 parent cd88bca
commit 492df89
Show file tree

Hide file tree

Showing 42 changed files with 378 additions and 52 deletions.
diff --git a/CONST_CHANGELOG.txt b/CONST_CHANGELOG.txt
@@ -17,7 +17,9 @@ Information
    Migration guide: https://mapserver.org/MIGRATION_GUIDE.html#mapserver-7-6-to-8-0-migration.
    Deprecated element from `CLASS` removed (moved to `STYLE`) https://mapserver.org/development/rfc/ms-rfc-133.html#rfc133.
 
+2. We added the support of 'main_ogc_server' to WMS mapserver proxy URL.
+    This means that if the value 'vars/main_ogc_server' is present in the vars.yaml of the project,
+    that will be used as default value when no 'ogcserver' parameter is present in the request.
 
 Changes to apply
 ================
-
diff --git a/CONST_create_template/Dockerfile b/CONST_create_template/Dockerfile
@@ -14,7 +14,7 @@ ENV CONFIG_VARS sqlalchemy.url sqlalchemy.pool_recycle sqlalchemy.pool_size sqla
     dbsessions urllogin host_forward_host headers_whitelist headers_blacklist \
     smtp c2c.base_path welcome_email \
     lingua_extractor interfaces_config interfaces devserver_url api authentication intranet metrics pdfreport \
-    vector_tiles i18next
+    vector_tiles i18next main_ogc_server
 
 COPY . /tmp/config/
 

diff --git a/CONST_create_template/build b/CONST_create_template/build
@@ -10,7 +10,7 @@ import stat
 import subprocess
 import sys
 import urllib.request
-from typing import Any, Dict, List, Optional
+from typing import Any, List
 
 import yaml
 
@@ -58,7 +58,7 @@ def main() -> None:
         match = re.match(r"^([0-9]+\.[0-9]+)\.[0-9a-z]+\.[0-9]+$", args.upgrade)
         if match is not None:
             major_version = match.group(1)
-        full_version = args.upgrade if args.upgrade != "master" else "latest"
+        full_version = args.upgrade
         with open("upgrade", "w", encoding="utf-8") as f:
             with urllib.request.urlopen(  # nosec
                 "https://raw.githubusercontent.com/camptocamp/c2cgeoportal/{major_version}/scripts/upgrade".format(

diff --git a/CONST_create_template/ci/config.yaml b/CONST_create_template/ci/config.yaml
@@ -17,5 +17,6 @@ version:
 publish:
   pypi: false
   docker:
+    dispatch: {}
     images:
       - name: camptocamp/geomapfish-config
diff --git a/CONST_create_template/ci/requirements.txt b/CONST_create_template/ci/requirements.txt
@@ -1 +1 @@
-c2cciutils[checks,publish]==1.4.4
+c2cciutils[checks,publish]==1.4.7
diff --git a/CONST_create_template/docker-compose-lib.yaml b/CONST_create_template/docker-compose-lib.yaml
@@ -58,7 +58,12 @@ services:
       - AWS_DEFAULT_REGION
       - AWS_S3_ENDPOINT
       - AZURE_STORAGE_CONNECTION_STRING
+      - AZURE_STORAGE_ACCOUNT
+      - AZURE_STORAGE_ACCESS_TOKEN
+      - AZURE_STORAGE_ACCESS_KEY
+      - AZURE_STORAGE_SAS_TOKEN
       - TILEGENERATION_AZURE_CONTAINER
+      - RASTER_BASE_PATH
 
   print:
     image: camptocamp/mapfish_print:3.29
@@ -94,6 +99,10 @@ services:
       - AWS_DEFAULT_REGION
       - AWS_S3_ENDPOINT
       - AZURE_STORAGE_CONNECTION_STRING
+      - AZURE_STORAGE_ACCOUNT
+      - AZURE_STORAGE_ACCESS_TOKEN
+      - AZURE_STORAGE_ACCESS_KEY
+      - AZURE_STORAGE_SAS_TOKEN
       - CPL_VSIL_CURL_USE_CACHE
       - CPL_VSIL_CURL_CACHE_SIZE
       - CPL_VSIL_CURL_USE_HEAD
@@ -170,6 +179,10 @@ services:
       - AWS_ACCESS_KEY_ID
       - AWS_SECRET_ACCESS_KEY
       - AZURE_STORAGE_CONNECTION_STRING
+      - AZURE_STORAGE_ACCOUNT
+      - AZURE_STORAGE_ACCESS_TOKEN
+      - AZURE_STORAGE_ACCESS_KEY
+      - AZURE_STORAGE_SAS_TOKEN
       - C2C_BASE_PATH
       - C2C_REDIS_URL
       - C2C_REDIS_SENTINELS
@@ -211,6 +224,10 @@ services:
       - AWS_ACCESS_KEY_ID
       - AWS_SECRET_ACCESS_KEY
       - AZURE_STORAGE_CONNECTION_STRING
+      - AZURE_STORAGE_ACCOUNT
+      - AZURE_STORAGE_ACCESS_TOKEN
+      - AZURE_STORAGE_ACCESS_KEY
+      - AZURE_STORAGE_SAS_TOKEN
 
   geoportal:
     image: camptocamp/geomapfishapp-geoportal:${GEOMAPFISH_MAIN_VERSION}
@@ -241,6 +258,10 @@ services:
       - AWS_DEFAULT_REGION
       - AWS_S3_ENDPOINT
       - AZURE_STORAGE_CONNECTION_STRING
+      - AZURE_STORAGE_ACCOUNT
+      - AZURE_STORAGE_ACCESS_TOKEN
+      - AZURE_STORAGE_ACCESS_KEY
+      - AZURE_STORAGE_SAS_TOKEN
       - VISIBLE_WEB_HOST
       - VISIBLE_WEB_PROTOCOL
       - AUTHTKT_TIMEOUT
@@ -332,6 +353,10 @@ services:
       - AWS_DEFAULT_REGION
       - AWS_S3_ENDPOINT
       - AZURE_STORAGE_CONNECTION_STRING
+      - AZURE_STORAGE_ACCOUNT
+      - AZURE_STORAGE_ACCESS_TOKEN
+      - AZURE_STORAGE_ACCESS_KEY
+      - AZURE_STORAGE_SAS_TOKEN
       - VISIBLE_WEB_HOST
       - VISIBLE_WEB_PROTOCOL
       - AUTHTKT_TIMEOUT
@@ -421,6 +446,7 @@ services:
       target: builder
       args:
         GEOMAPFISH_VERSION: ${GEOMAPFISH_VERSION}
+        GEOMAPFISH_MAIN_VERSION: ${GEOMAPFISH_MAIN_VERSION}
     volumes:
       - ./geoportal/${PACKAGE}_geoportal/static-ngeo:/app/${PACKAGE}_geoportal/static-ngeo
     environment:
@@ -441,6 +467,10 @@ services:
       - AWS_DEFAULT_REGION
       - AWS_S3_ENDPOINT
       - AZURE_STORAGE_CONNECTION_STRING
+      - AZURE_STORAGE_ACCOUNT
+      - AZURE_STORAGE_ACCESS_TOKEN
+      - AZURE_STORAGE_ACCESS_KEY
+      - AZURE_STORAGE_SAS_TOKEN
 
   db:
     image: camptocamp/postgres:${POSTGRES_TAG}

diff --git a/CONST_create_template/env.default b/CONST_create_template/env.default
@@ -1,5 +1,5 @@
 # Default values for c2cgeoportal
-GEOMAPFISH_VERSION=latest
+GEOMAPFISH_VERSION=2.8
 GEOMAPFISH_MAIN_VERSION=2.8
 COMPOSE_PROJECT_NAME=geomapfish
 PACKAGE=geomapfish

diff --git a/CONST_create_template/env.project b/CONST_create_template/env.project
@@ -25,6 +25,12 @@ PGSSLMODE=require
 AWS_DEFAULT_REGION=ch-dk-2
 AWS_S3_ENDPOINT=sos-ch-dk-2.exo.io
 
+# Set the raster Base path
+# Amazon S3
+# RASTER_BASE_PATH=/vsis3/<bucket>/
+# Azure Blob Storage
+# RASTER_BASE_PATH=/vsiaz/<container>/
+
 # Use the mutualize print, ask Camptocamp to configure your project.
 # PRINT_URL=https://mutualized-print.apps.openshift-ch-1.camptocamp.com/print/geomapfish/
 # To use the internal print:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		c2cciutils[checks,publish]==1.4.4
		c2cciutils[checks,publish]==1.4.7