From a34500bdc1f1509fa63bcf7e7d2f64808ea3e2c8 Mon Sep 17 00:00:00 2001 From: chrisnatali <chris.natali@gmail.com> Date: Tue, 23 Feb 2016 17:38:52 -0500 Subject: [PATCH] Further restrict bounds, num nodes to reduce memory requirements --- docker-compose.yml | 2 +- server-cgimap/Dockerfile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0ce42d4..04f3ea2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ gridmaps: - ./gridmaps-nginx.conf:/etc/nginx/sites-enabled/gridmaps-nginx.conf gridmaps-cgimap: - image: "selcolumbia/osm-gridmaps-cgimap:0.3" + image: "selcolumbia/osm-gridmaps-cgimap:0.4" links: - "db:db" volumes: diff --git a/server-cgimap/Dockerfile b/server-cgimap/Dockerfile index c695719..23846be 100644 --- a/server-cgimap/Dockerfile +++ b/server-cgimap/Dockerfile @@ -24,10 +24,10 @@ WORKDIR / RUN git clone git://github.com/zerebubuth/openstreetmap-cgimap.git WORKDIR /openstreetmap-cgimap # hack to workaround the fact that these aren't configurable yet -RUN sed -i 's/#define MAX_AREA .*$/#define MAX_AREA 1000\.0/' src/api06/map_handler.cpp -RUN sed -i 's/#define MAX_AREA .*$/#define MAX_AREA 1000\.0/' src/api07/map_handler.cpp -RUN sed -i 's/#define MAX_NODES .*$/#define MAX_NODES 100000/' src/api06/map_handler.cpp -RUN sed -i 's/#define MAX_NODES .*$/#define MAX_NODES 100000/' src/api07/map_handler.cpp +RUN sed -i 's/#define MAX_AREA .*$/#define MAX_AREA 100\.0/' src/api06/map_handler.cpp +RUN sed -i 's/#define MAX_AREA .*$/#define MAX_AREA 100\.0/' src/api07/map_handler.cpp +RUN sed -i 's/#define MAX_NODES .*$/#define MAX_NODES 50000/' src/api06/map_handler.cpp +RUN sed -i 's/#define MAX_NODES .*$/#define MAX_NODES 50000/' src/api07/map_handler.cpp RUN ./autogen.sh RUN ./configure --with-fcgi=/usr --with-boost-libdir=/usr/lib/x86_64-linux-gnu RUN make && make install