c2cgeoportal-geoportal 2.6.0__py2.py3-none-any.whl → 2.8.1.180__py2.py3-none-any.whl

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/build

@@ -0,0 +1,186 @@
+#!/usr/bin/env python3
+
+import argparse
+import os
+import os.path
+import platform
+import re
+import shlex
+import shutil
+import stat
+import subprocess
+import sys
+import urllib.request
+from typing import TYPE_CHECKING, Any, List, Optional
+
+import yaml
+
+CompletedProcess = subprocess.CompletedProcess[str] if TYPE_CHECKING else subprocess.CompletedProcess
+
+
+def run(
+    args: argparse.Namespace, command: List[str], exit_on_error: bool = True, **kwargs: Any
+) -> Optional[CompletedProcess]:
+    if args.verbose or args.dry_run:
+        print(" ".join([shlex.quote(c) for c in command]))
+    if not args.dry_run or "stdout" in kwargs:
+        if args.stack_trace and exit_on_error and not "checks" in kwargs:
+            kwargs["check"] = True
+        process = subprocess.run(command, **kwargs)  # nosec
+        if exit_on_error and process.returncode != 0:
+            print(
+                "An error occurred during execution of `{}`".format(
+                    " ".join([shlex.quote(c) for c in command])
+                )
+            )
+            sys.exit(process.returncode)
+        return process
+    return None
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(description="Build the project")
+    parser.add_argument("--verbose", action="store_true", help="Display the Docker build commands")
+    parser.add_argument(
+        "--dry-run", action="store_true", help="Display the docker build commands without executing them"
+    )
+    parser.add_argument("--service", help="Build only the specified service")
+    parser.add_argument("--env", action="store_true", help="Build only the .env file")
+    parser.add_argument("--simple", action="store_true", help="Force simple application mode")
+    parser.add_argument("--not-simple", action="store_true", help="Force not simple application mode")
+    parser.add_argument("--upgrade", help="Start upgrading the project to version")
+    parser.add_argument(
+        "--reload",
+        nargs="?",
+        action="store",
+        const="",
+        help="Comma separate list of services that will be reloaded after the build",
+    )
+    parser.add_argument(
+        "--no-pull",
+        action="store_true",
+        default=os.environ.get("CI", "FALSE").upper() == "TRUE",
+        help="Do not pull external or base images for faster rebuild during development.",
+    )
+    parser.add_argument(
+        "--debug", help="Path to c2cgeoportal source folder to be able to debug the upgrade procedure"
+    )
+    parser.add_argument("--stack-trace", action="store_true", help="Display the stack trace on error")
+    parser.add_argument(
+        "--docker-compose-version-2", action="store_true", help="Use Docker Compose version 2"
+    )
+    parser.add_argument("env_files", nargs="*", help="The environment config")
+    args = parser.parse_args()
+
+    if args.upgrade:
+        major_version = args.upgrade
+        match = re.match(r"^([0-9]+\.[0-9]+)\.[0-9]+$", args.upgrade)
+        if match is not None:
+            major_version = match.group(1)
+        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
+        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(
+                    major_version=major_version
+                )
+            ) as result:
+                if result.code != 200:
+                    print("ERROR:")
+                    print(result.read())
+                    sys.exit(1)
+                f.write(result.read().decode())
+        debug_args = []
+        if args.debug:
+            shutil.copyfile(os.path.join(args.debug, "scripts", "upgrade"), "upgrade")
+            debug_args = ["--debug", args.debug]
+        os.chmod("upgrade", os.stat("upgrade").st_mode | stat.S_IXUSR)
+        try:
+            if platform.system() == "Windows":
+                run(args, ["python", "upgrade", full_version] + debug_args)
+            else:
+                run(args, ["./upgrade", full_version] + debug_args)
+        except subprocess.CalledProcessError:
+            sys.exit(1)
+        sys.exit(0)
+
+    with open("project.yaml", encoding="utf-8") as project_file:
+        project_env = yaml.load(project_file, Loader=yaml.SafeLoader)["env"]
+    if len(args.env_files) != project_env["required_args"]:
+        print(project_env["help"])
+        sys.exit(1)
+    env_files = [e.format(*args.env_files) for e in project_env["files"]]
+    print("Use env files: {}".format(", ".join(env_files)))
+    for env_file in env_files:
+        if not os.path.exists(env_file):
+            print("Error: the env file '{env_file}' does not exist.".format(env_file=env_file))
+            sys.exit(1)
+
+    with open(".env", "w", encoding="utf-8") as dest:
+        for file_ in env_files:
+            with open(file_, encoding="utf-8") as src:
+                dest.write(src.read() + "\n")
+
+            simple = not os.path.exists("geoportal/Dockerfile")
+            if args.simple:
+                simple = True
+            if args.not_simple:
+                simple = False
+
+            git_hash = run(args, ["git", "rev-parse", "HEAD"], stdout=subprocess.PIPE).stdout.decode().strip()
+
+            dest.write("SIMPLE={}\n".format(str(simple).upper()))
+            dest.write("GIT_HASH={git_hash}\n".format(git_hash=git_hash))
+
+        dest.write("# Used env files: {}\n".format(", ".join(env_files)))
+
+    docker_compose = ["docker", "compose"] if args.docker_compose_version_2 else ["docker-compose"]
+    if not args.env:
+        docker_compose_build_cmd = [*docker_compose, "build"]
+
+        if not args.no_pull:
+            # Pull all the images
+            if not args.service:
+                run(args, [*docker_compose, "pull", "--ignore-pull-failures"])  # nosec
+            docker_compose_build_cmd.append("--pull")
+
+        if args.service:
+            docker_compose_build_cmd.append(args.service)
+
+        print_args = [a.replace(" ", "\\ ") for a in docker_compose_build_cmd]
+        print_args = [a.replace('"', '\\"') for a in print_args]
+        print_args = [a.replace("'", "\\'") for a in print_args]
+        try:
+            env = {"DOCKER_BUILDKIT": "1", "COMPOSE_DOCKER_CLI_BUILD": "1"}
+            env.update(os.environ)
+            run(args, docker_compose_build_cmd, env=env)  # nosec
+        except subprocess.CalledProcessError as e:
+            print("Error with command: " + " ".join(print_args))
+            sys.exit(e.returncode)
+
+    if args.reload:
+        services = args.reload.split(",")
+    elif args.reload == "":
+        services = [
+            service
+            for service in run(
+                args,
+                [*docker_compose, "ps", "--services", "--all"],
+                stdout=subprocess.PIPE,
+                exit_on_error=True,
+            )
+            .stdout.decode()
+            .splitlines()
+            if not service.startswith("redis")
+        ]
+
+    if args.reload is not None:
+        run(args, [*docker_compose, "rm", "--force", "-v", "config"])
+        for service in services:
+            run(args, [*docker_compose, "up", "--detach", "--force-recreate", service])
+
+
+if __name__ == "__main__":
+    main()

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/config.yaml

@@ -0,0 +1,22 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/1.4/c2cciutils/schema.json
+
+checks:
+  codespell: False
+  required_workflows: False
+  dependabot_config: False
+  prospector_config: False
+  setup: False
+
+version:
+  branch_to_version_re:
+    - from: (prod-[0-9]+-[0-9]+)
+      to: \1
+    - from: (int-[0-9]+-[0-9]+)
+      to: \1
+
+publish:
+  pypi: false
+  docker:
+    dispatch: {}
+    images:
+      - name: camptocamp/{{cookiecutter.package}}-config

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/docker-compose-check

@@ -0,0 +1,25 @@
+#!/usr/bin/env python3
+
+import argparse
+import subprocess
+import sys
+
+
+def _main() -> None:
+    argparser = argparse.ArgumentParser("Tests that's all the services are running")
+    argparser.parse_args()
+
+    services = [
+        s.strip()
+        for s in subprocess.run(["docker", "compose", "ps"], check=True, stdout=subprocess.PIPE)
+        .stdout.decode("utf-8")
+        .splitlines()
+    ]
+    errors_statuses = [s for s in services if " Exit " in s and not s.endswith(" Exit 0")]
+    if errors_statuses:
+        print("\n".join(errors_statuses))
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    _main()

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/requirements.txt

@@ -0,0 +1 @@
+c2cciutils[checks,publish]==1.4.21

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-db.yaml

@@ -0,0 +1,26 @@
+# This file is used by the acceptance tests to have a local database.
+
+version: '2.3'
+
+volumes:
+  postgresql_data:
+
+services:
+  config: &db-config
+    environment:
+      - PGHOST=db
+      - PGHOST_SLAVE=db
+      - PGSSLMODE=prefer
+  geoportal: *db-config
+  # geoportal-advance: *db-config
+  tools: *db-config
+  alembic: *db-config
+  # alembic-advance: *db-config
+  # webpack_dev_server: *db-config
+
+  db:
+    extends:
+      file: docker-compose-lib.yaml
+      service: db
+    volumes:
+      - postgresql_data:/var/lib/postgresql/data

c2cgeoportal_geoportal/scaffolds/create/{docker-compose-lib.yaml → {{cookiecutter.project}}/docker-compose-lib.yaml}

@@ -1,9 +1,18 @@
----
-version: '2.0'
+# This file is managed by c2cgeoportal, it contains the default services configuration
+
+version: '2.3'
 
 services:
   config:
     image: ${DOCKER_BASE}-config:${DOCKER_TAG}
+    build:
+      context: .
+      args:
+        SIMPLE: ${SIMPLE}
+        PGSCHEMA: ${PGSCHEMA}
+        GEOMAPFISH_VERSION: ${GEOMAPFISH_VERSION}
+        GEOMAPFISH_MAIN_VERSION: ${GEOMAPFISH_MAIN_VERSION}
+        GEOMAPFISH_MAIN_MINOR_VERSION: ${GEOMAPFISH_MAIN_MINOR_VERSION}
     user: www-data
     environment:
       - VISIBLE_WEB_HOST
@@ -18,9 +27,13 @@ services:
       - PGDATABASE
       - PGSSLMODE
       - PGSCHEMA_STATIC
+      - SRID
       - SQLALCHEMY_POOL_RECYCLE
       - SQLALCHEMY_POOL_SIZE
       - SQLALCHEMY_MAX_OVERFLOW
+      - SQLALCHEMY_SLAVE_POOL_RECYCLE
+      - SQLALCHEMY_SLAVE_POOL_SIZE
+      - SQLALCHEMY_SLAVE_MAX_OVERFLOW
       - GEOPORTAL_INTERNAL_URL
       - GEOPORTAL_INTERNAL_HOST
       - GEOPORTAL_INTERNAL_PORT
@@ -30,7 +43,10 @@ services:
       - MUTUALIZED_PRINT_URL
       - DISABLE_MUTUALIZED_PRINT
       - DISABLE_LOCAL_PRINT
+      - DISABLE_MUTUALIZE
+      - DISABLE_LOCAL
       - MAPSERVER_URL
+      - QGISSERVER_URL
       - REDIS_HOST
       - REDIS_PORT
       - REDIS_DB
@@ -42,9 +58,18 @@ services:
       - AWS_SECRET_ACCESS_KEY
       - 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
+      - DISABLE_HAPROXY_LOGGING
+      - HAPROXY_LOGGING_OPTIONS
 
   print:
-    image: camptocamp/mapfish_print:3.27
+    image: camptocamp/mapfish_print:3.30
     user: www-data
     restart: unless-stopped
     environment:
@@ -52,12 +77,26 @@ services:
       - PGOPTIONS
 
   mapserver:
-    image: camptocamp/mapserver:7.6
+    image: camptocamp/mapserver:8.0-gdal3.7
     user: www-data
     restart: unless-stopped
     entrypoint: []
     environment:
       - PGOPTIONS
+      - MAPSERVER_CONFIG_FILE=/etc/mapserver/mapserver.conf
+      - AWS_ACCESS_KEY_ID
+      - AWS_SECRET_ACCESS_KEY
+      - 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
+      - GDAL_DISABLE_READDIR_ON_OPEN
 
   qgisserver:
     image: camptocamp/geomapfish-qgisserver:gmf${GEOMAPFISH_MAIN_VERSION}-qgis${QGIS_VERSION}
@@ -75,16 +114,35 @@ services:
       - AWS_SECRET_ACCESS_KEY
       - 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
       - GDAL_DISABLE_READDIR_ON_OPEN
-      - QGIS_SERVER_LOG_LEVEL=2
-      - LOG_LEVEL=INFO
+      - QGIS_SERVER_LOG_LEVEL
+      - QGIS_AUTH_DB_DIR_PATH
+      - QGIS_SERVER_IGNORE_BAD_LAYERS
+      - QGIS_SERVER_DISABLE_GETPRINT
+      - PGSERVICEFILE
+      - LOG_LEVEL=${QGIS_LOG_LEVEL}
       - LOG_TYPE
       - C2CGEOPORTAL_LOG_LEVEL
       - SQL_LOG_LEVEL
       - OTHER_LOG_LEVEL
+      - GEOMAPFISH_ACCESSCONTROL_BASE_URL=${QGISSERVER_URL}
+      - QGIS_SERVER_TRUST_LAYER_METADATA
+      - QGIS_SERVER_PARALLEL_RENDERING
+      - MAX_CACHE_LAYERS
+      - QGIS_SERVER_CACHE_SIZE
+      - QGIS_SERVER_WMS_MAX_HEIGHT
+      - QGIS_SERVER_WMS_MAX_WIDTH
+      - QGIS_SERVER_API_WFS3_MAX_LIMIT
+      - QGIS_SERVER_LANDING_PAGE_PROJECTS_DIRECTORIES
+      - QGIS_SERVER_OVERRIDE_SYSTEM_LOCALE
 
   tinyows:
     image: camptocamp/tinyows:master
@@ -92,7 +150,7 @@ services:
     restart: unless-stopped
 
   redis:
-    image: redis:6
+    image: &redis-image redis:7.0
     user: www-data
     restart: unless-stopped
     command:
@@ -109,10 +167,10 @@ services:
       - '30'
 
   redis_master:
-    image: redis:6
+    image: *redis-image
 
   redis_slave:
-    image: redis:6
+    image: *redis-image
     command: redis-server --slaveof redis_master 6379
 
   redis_sentinel:
@@ -123,16 +181,21 @@ services:
       - MASTER=redis_master
 
   tilecloudchain:
-    image: camptocamp/tilecloud-chain:1.15
+    image: &tilecloudchain-image camptocamp/tilecloud-chain:1.17
     user: www-data
     restart: unless-stopped
     environment:
       - DEVELOPMENT
-      - GUNICORN_PARAMS
       - VISIBLE_ENTRY_POINT
       - TILEGENERATION_CONFIGFILE=/etc/tilegeneration/config.yaml
       - 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
+      - AZURE_STORAGE_ACCOUNT_URL
       - C2C_BASE_PATH
       - C2C_REDIS_URL
       - C2C_REDIS_SENTINELS
@@ -148,6 +211,14 @@ services:
       - C2C_PROFILER_PATH
       - C2C_PROFILER_MODULES
       - C2C_SECRET
+      - C2C_AUTH_GITHUB_REPOSITORY
+      - C2C_AUTH_GITHUB_ACCESS_TYPE
+      - C2C_AUTH_GITHUB_CLIENT_ID
+      - C2C_AUTH_GITHUB_CLIENT_SECRET
+      - C2C_AUTH_GITHUB_SCOPE
+      - C2C_AUTH_GITHUB_SECRET
+      - C2C_AUTH_GITHUB_PROXY_URL
+      - C2C_USE_SESSION=true
       - TILECLOUD_LOG_LEVEL
       - TILECLOUD_CHAIN_LOG_LEVEL
       - C2CWSGI_LOG_LEVEL
@@ -155,7 +226,7 @@ services:
       - LOG_TYPE
 
   tilegeneration_slave:
-    image: camptocamp/tilecloud-chain:1.15
+    image: *tilecloudchain-image
     user: www-data
     restart: unless-stopped
     entrypoint:
@@ -165,12 +236,18 @@ services:
     environment:
       - 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
+      - AZURE_STORAGE_ACCOUNT_URL
 
   geoportal:
-    image: ${DOCKER_BASE}-geoportal:${DOCKER_TAG}
+    image: camptocamp/geomapfishapp-geoportal:${GEOMAPFISH_MAIN_MINOR_VERSION}
     user: www-data
     restart: unless-stopped
-    environment:
+    environment: &geoportal-env
       - DEVELOPMENT
       - VISIBLE_ENTRY_POINT
       - PACKAGE
@@ -182,16 +259,28 @@ services:
       - PGPASSWORD
       - PGDATABASE
       - PGSSLMODE
+      - PGSCHEMA
       - PGSCHEMA_STATIC
       - PGOPTIONS
       - SQLALCHEMY_POOL_RECYCLE
       - SQLALCHEMY_POOL_SIZE
       - SQLALCHEMY_MAX_OVERFLOW
+      - SQLALCHEMY_SLAVE_POOL_RECYCLE
+      - SQLALCHEMY_SLAVE_POOL_SIZE
+      - SQLALCHEMY_SLAVE_MAX_OVERFLOW
       - AWS_ACCESS_KEY_ID
       - AWS_SECRET_ACCESS_KEY
       - AWS_DEFAULT_REGION
       - AWS_S3_ENDPOINT
-      - GUNICORN_PARAMS
+      - 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
+      - GDAL_DISABLE_READDIR_ON_OPEN
       - VISIBLE_WEB_HOST
       - VISIBLE_WEB_PROTOCOL
       - AUTHTKT_TIMEOUT
@@ -227,19 +316,43 @@ services:
       - C2C_PROFILER_MODULES
       - C2C_DEBUG_VIEW_ENABLED=TRUE
       - C2C_SECRET
+      - C2C_AUTH_GITHUB_REPOSITORY
+      - C2C_AUTH_GITHUB_ACCESS_TYPE
+      - C2C_AUTH_GITHUB_CLIENT_ID
+      - C2C_AUTH_GITHUB_CLIENT_SECRET
+      - C2C_AUTH_GITHUB_SCOPE
+      - C2C_AUTH_GITHUB_SECRET
+      - C2C_AUTH_GITHUB_PROXY_URL
       - LOG_LEVEL
       - C2CGEOPORTAL_LOG_LEVEL
       - SQL_LOG_LEVEL
       - GUNICORN_LOG_LEVEL
       - OTHER_LOG_LEVEL
       - DOGPILECACHE_LOG_LEVEL
+      - C2CWSGIUTILS_LOG_LEVEL
       - LOG_TYPE
+      - C2CGEOPORTAL_THEME_TIMEOUT=300
+
+  geoportal-advance:
+    image: ${DOCKER_BASE}-geoportal:${DOCKER_TAG}
+    build: &geoportal-build
+      context: geoportal
+      args:
+        GIT_HASH: ${GIT_HASH}
+        PGSCHEMA: ${PGSCHEMA}
+        GEOMAPFISH_VERSION: ${GEOMAPFISH_VERSION}
+        GEOMAPFISH_MAIN_VERSION: ${GEOMAPFISH_MAIN_VERSION}
+        GEOMAPFISH_MAIN_MINOR_VERSION: ${GEOMAPFISH_MAIN_MINOR_VERSION}
+    user: www-data
+    restart: unless-stopped
+    environment: *geoportal-env
 
   tools:
     image: camptocamp/geomapfish-tools:${GEOMAPFISH_VERSION}
     restart: unless-stopped
+    volumes:
+      - .:/src
     environment:
-      - PGSCHEMA
       # From geoportal
       - DEVELOPMENT
       - VISIBLE_ENTRY_POINT
@@ -252,13 +365,18 @@ services:
       - PGPASSWORD
       - PGDATABASE
       - PGSSLMODE
+      - PGSCHEMA
       - PGSCHEMA_STATIC
       - PGOPTIONS
       - AWS_ACCESS_KEY_ID
       - AWS_SECRET_ACCESS_KEY
       - AWS_DEFAULT_REGION
       - AWS_S3_ENDPOINT
-      - GUNICORN_PARAMS
+      - 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
@@ -293,17 +411,18 @@ services:
       - C2C_PROFILER_PATH
       - C2C_PROFILER_MODULES
       - C2C_DEBUG_VIEW_ENABLED=TRUE
-      - C2C_SECRET
       - LOG_LEVEL
       - C2CGEOPORTAL_LOG_LEVEL
       - SQL_LOG_LEVEL
       - GUNICORN_LOG_LEVEL
       - OTHER_LOG_LEVEL
       - DOGPILECACHE_LOG_LEVEL
+      - C2CWSGIUTILS_LOG_LEVEL
       - LOG_TYPE
+      - SUFFIX=
 
-  alembic:
-    image: ${DOCKER_BASE}-geoportal:${DOCKER_TAG}
+  alembic: &alembic
+    image: camptocamp/geomapfishapp-geoportal:${GEOMAPFISH_MAIN_VERSION}
     user: www-data
     entrypoint: []
     command:
@@ -323,11 +442,16 @@ services:
       - PGSCHEMA_STATIC
       - LOG_TYPE
 
+  alembic-advance:
+    <<: *alembic
+    image: ${DOCKER_BASE}-geoportal:${DOCKER_TAG}
+    build: *geoportal-build
+
   front:
-    image: haproxy:2.2
+    image: haproxy:2.6.7
     restart: unless-stopped
     volumes:
-      - /dev/log:/dev/log:rw
+      - ${FRONT_LOG_DIRECTORY}:/dev/log:rw
     command:
       - haproxy
       - -f
@@ -337,6 +461,13 @@ services:
 
   webpack_dev_server:
     image: ${DOCKER_BASE}-geoportal-dev:${DOCKER_TAG}
+    build:
+      context: geoportal
+      target: builder
+      args:
+        GEOMAPFISH_VERSION: ${GEOMAPFISH_VERSION}
+        GEOMAPFISH_MAIN_VERSION: ${GEOMAPFISH_MAIN_VERSION}
+        GEOMAPFISH_MAIN_MINOR_VERSION: ${GEOMAPFISH_MAIN_MINOR_VERSION}
     volumes:
       - ./geoportal/${PACKAGE}_geoportal/static-ngeo:/app/${PACKAGE}_geoportal/static-ngeo
     environment:
@@ -356,3 +487,15 @@ services:
       - AWS_SECRET_ACCESS_KEY
       - 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}
+    environment:
+      - POSTGRES_PASSWORD=${PGPASSWORD}
+      - POSTGRES_DB=${PGDATABASE}
+      - POSTGRES_USER=${PGUSER}

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-qgis.yaml

@@ -0,0 +1,23 @@
+# This file is used to run QGIS client from the Docker image
+
+version: '2'
+
+services:
+  qgis:
+    extends:
+      file: docker-compose-lib.yaml
+      service: qgisserver
+    image: camptocamp/qgis-server:${QGIS_VERSION}-desktop
+    user: root
+    volumes_from:
+      - config
+    volumes:
+      - ${HOME}:${HOME}
+      - /tmp/.X11-unix:/tmp/.X11-unix
+    environment:
+      - PGSERVICEFILE=/etc/qgisserver/pg_service.conf
+      - DISPLAY=unix${DISPLAY}
+      - QGIS_DEBUG=0
+      - QGIS_LOG_FILE=/dev/null
+      - PGOPTIONS=-c statement_timeout=30000
+      - AZURE_STORAGE_CONNECTION_STRING