Merge pull request #3864 from camptocamp/nonroot-mapcache

Mapcache as nonroot
camptocamp · Jun 27, 2018 · 98d05b5 · 98d05b5
2 parents 9d9d339 + 918b2b7
commit 98d05b5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose.yaml.mako b/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose.yaml.mako
@@ -41,9 +41,10 @@ ${service_defaults('tinyows', 80)}\
 
   mapcache:
     image: camptocamp/mapcache:1.6
+    user: www-data
     volumes_from:
       - config:ro
-${service_defaults('mapcache', 80)}\
+${service_defaults('mapcache', 8080)}\
 
   memcached:
     image: memcached:1.5

diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/update/CONST_vars.yaml_tmpl b/geoportal/c2cgeoportal_geoportal/scaffolds/update/CONST_vars.yaml_tmpl
@@ -582,7 +582,7 @@ runtime_environment:
   - name: PRINT_URL
     default: http://print:8080/print/
   - name: MAPCACHE_URL
-    default: http://mapcache/
+    default: http://mapcache:8080/
   - name: DEVSERVER_URL
     default: http://webpack-dev-server:8080/
   - name: REDIS_HOST