Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix upgrade PO #5023

Merged
merged 1 commit into from
Jun 14, 2019
Merged

Fix upgrade PO #5023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose-lib.yaml_tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down