Merge pull request #5023 from camptocamp/fix-update-po

Fix upgrade PO
camptocamp · Jun 14, 2019 · 49b4e65 · 49b4e65
2 parents 0aa0d71 + 2053730
commit 49b4e65
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose-build.yaml b/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose-build.yaml
@@ -20,6 +20,20 @@ services:
     volumes_from:
       - config:rw
 
+  ## qgisserver:
+  ##   extends:
+  ##     file: docker-compose-lib.yaml
+  ##     service: qgisserver
+  ##   volumes_from:
+  ##     - config:ro
+  ##   environment:
+  ##     # Single QGIS project files
+  ##     QGIS_PROJECT_FILE: /etc/qgisserver/project.qgz
+  ##     GEOMAPFISH_OGCSERVER: <OGC server name>
+  ##     # Multiple QGIS project files
+  ##     # QGIS_PROJECT_FILE:
+  ##     # GEOMAPFISH_ACCESSCONTROL_CONFIG: /etc/qgisserver/accesscontrol_config.yaml
+
   build:
     extends:
       file: docker-compose-lib.yaml

diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose-lib.yaml_tmpl b/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose-lib.yaml_tmpl
@@ -240,6 +240,8 @@ services:
       - USER_NAME
       - USER_ID
       - GROUP_ID
+      - BUILD_VOLUME_NAME
+      - PROJECT_DIRECTORY
 
   webpack_dev_server:
     image: ${DOCKER_BASE}-geoportal:${DOCKER_TAG}