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

Mapserver 7.2 #3949

Merged
merged 2 commits into from
Aug 2, 2018
Merged

Mapserver 7.2 #3949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc251f4
Update to mapserver 7.2
sbrunner Aug 2, 2018
6107d52
Fix stange test
sbrunner Aug 2, 2018
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
2 changes: 1 addition & 1 deletion docker/test-mapserver/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM camptocamp/mapserver:7.0
FROM camptocamp/mapserver:7.2
LABEL maintainer Camptocamp "info@camptocamp.com"
COPY *.map /etc/mapserver/
2 changes: 1 addition & 1 deletion geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose-build.yaml.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
image: ${docker_base}-config:${docker_tag}

mapserver:
image: camptocamp/mapserver:7.0
image: camptocamp/mapserver:7.2
volumes_from:
- config:rw
${service_defaults('mapserver', 80)}\
Expand Down
2 changes: 1 addition & 1 deletion geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose.yaml.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ${service_defaults('config')}\
${service_defaults('print', 8080)}\

mapserver:
image: camptocamp/mapserver:7.0
image: camptocamp/mapserver:7.2
user: www-data
volumes_from:
- config:rw
Expand Down
2 changes: 1 addition & 1 deletion geoportal/tests/functional/test_entry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1165,7 +1165,7 @@ def test_layer(self):
"minResolutionHint": 1.76,
"maxResolutionHint": 8.8200000000000003,
"public": True,
"queryable": 0,
"queryable": 1,
"metadataUrls": [{
"url": "http://example.com/wmsfeatures.metadata",
"type": "TC211",
Expand Down
2 changes: 1 addition & 1 deletion travis/docker-compose-build.yaml.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ${service_defaults('db', 5432)}\
${service_defaults('external-db', 5432)}\

mapserver:
image: camptocamp/mapserver:7.0
image: camptocamp/mapserver:7.2
volumes_from:
- config:rw
links:
Expand Down
2 changes: 1 addition & 1 deletion travis/docker-compose.yaml.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ${service_defaults('external-db', 5432)}\
${service_defaults('print', 8080)}\

mapserver:
image: camptocamp/mapserver:7.0
image: camptocamp/mapserver:7.2
user: www-data
volumes_from:
- config:rw
Expand Down