From 9e5850635595ec14c02e01d7282077f6733d6d57 Mon Sep 17 00:00:00 2001
From: Cory Lueninghoener <cluening@lanl.gov>
Date: Thu, 10 Oct 2019 22:29:22 -0600
Subject: [PATCH] Makes the container more dynamic for use with the bikemap
 style

---
 Dockerfile | 11 ++++++++---
 run.sh     |  4 ++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cab830f..cc85de6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -111,11 +111,15 @@ USER renderer
 WORKDIR /home/renderer/src
 RUN git clone https://github.com/gravitystorm/openstreetmap-carto.git \
  && git -C openstreetmap-carto checkout v4.23.0
-WORKDIR /home/renderer/src/openstreetmap-carto
+
+# Install carto
 USER root
 RUN npm install -g carto@0.18.2
+
+# Make a place to mount the bikemap style
 USER renderer
-RUN carto project.mml > mapnik.xml
+WORKDIR /home/renderer/src
+RUN mkdir bikemap
 
 # Load shapefiles
 WORKDIR /home/renderer/src/openstreetmap-carto
@@ -124,7 +128,8 @@ RUN scripts/get-shapefiles.py
 # Configure renderd
 USER root
 RUN sed -i 's/renderaccount/renderer/g' /usr/local/etc/renderd.conf \
-  && sed -i 's/hot/tile/g' /usr/local/etc/renderd.conf
+  && sed -i 's/hot/tile/g' /usr/local/etc/renderd.conf \
+  && sed -i 's/openstreetmap-carto/bikemap/g' /usr/local/etc/renderd.conf 
 USER renderer
 
 # Configure Apache
diff --git a/run.sh b/run.sh
index 3f6c9a3..0daf15c 100755
--- a/run.sh
+++ b/run.sh
@@ -87,6 +87,10 @@ if [ "$1" = "run" ]; then
     # Configure renderd threads
     sed -i -E "s/num_threads=[0-9]+/num_threads=${THREADS:-4}/g" /usr/local/etc/renderd.conf
 
+    # Update the mapnik.xml style file
+    PROJECTDIR=/home/renderer/src/bikemap/
+    /usr/local/bin/carto ${PROJECTDIR}/project.mml > ${PROJECTDIR}/mapnik.xml
+
     # start cron job to trigger consecutive updates
     if [ "$UPDATES" = "enabled" ]; then
       /etc/init.d/cron start