Add proper handling of docker stop

use tag v4.23.0 from openstreetmap-carto instead to use master

Dockerfile

@@ -109,7 +109,8 @@ USER renderer
 
 # Configure stylesheet
 WORKDIR /home/renderer/src
-RUN git clone https://github.com/gravitystorm/openstreetmap-carto.git
+RUN git clone https://github.com/gravitystorm/openstreetmap-carto.git \
+ && git -C openstreetmap-carto checkout v4.23.0
 WORKDIR /home/renderer/src/openstreetmap-carto
 USER root
 RUN npm install -g carto@0.18.2

README.md

@@ -63,6 +63,8 @@ docker run \
     run
 ```
 
+**If you do this, then make sure to also run the import with the `openstreetmap-rendered-tiles` volume to make sure that caching works properly across updates!**
+
 ### Enabling automatic updating (optional)
 
 Given that you've specified both the OSM data and polygon as specified in the *Automatic updates* section during server setup, you can enable the updating process by setting the variable `UPDATES` to `enabled`:

run.sh

@@ -61,6 +61,9 @@ if [ "$1" = "import" ]; then
     # Create indexes
     sudo -u postgres psql -d gis -f indexes.sql
 
+    # Register that data has changed for mod_tile caching purposes
+    touch /var/lib/mod_tile/planet-import-complete
+
     service postgresql stop
 
     exit 0
@@ -92,8 +95,16 @@ if [ "$1" = "run" ]; then
       /etc/init.d/cron start
     fi
 
-    # Run
+    # Run while handling docker stop's SIGTERM
-    sudo -u renderer renderd -f -c /usr/local/etc/renderd.conf
+    stop_handler() {
+        kill -TERM "$child"
+    }
+    trap stop_handler SIGTERM
+
+    sudo -u renderer renderd -f -c /usr/local/etc/renderd.conf &
+    child=$!
+    wait "$child"
+
     service postgresql stop
 
     exit 0