Fix remaining references to PostgreSQL 10

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

Dockerfile

@@ -10,7 +10,10 @@ ENV UPDATES=disabled
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 # Install dependencies
-RUN echo "deb [ allow-insecure=yes ] http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main" >> /etc/apt/sources.list.d/pgdg.list \
+RUN apt-get update \
+  && apt-get install wget gnupg2 lsb-core -y \
+  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+  && echo "deb [ trusted=yes ] http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list \
   && apt-get update \
   && apt-get install -y apt-transport-https ca-certificates \
   && apt-get install -y --no-install-recommends --allow-unauthenticated \
@@ -24,7 +27,9 @@ RUN echo "deb [ allow-insecure=yes ] http://apt.postgresql.org/pub/repos/apt/ bi
   fonts-noto-hinted \
   fonts-noto-unhinted \
   clang \
+  gcc \
   gdal-bin \
+  make \
   git-core \
   libagg-dev \
   libboost-all-dev \
@@ -52,10 +57,9 @@ RUN echo "deb [ allow-insecure=yes ] http://apt.postgresql.org/pub/repos/apt/ bi
   nodejs \
   npm \
   postgis \
-  postgresql-10 \
-  postgresql-10-postgis-2.5 \
-  postgresql-10-postgis-2.5-scripts \
-  postgresql-contrib-10 \
+  postgresql-12 \
+  postgresql-server-dev-12 \
+  postgresql-contrib-12 \
   protobuf-c-compiler \
   python-mapnik \
   sudo \
@@ -72,6 +76,11 @@ RUN echo "deb [ allow-insecure=yes ] http://apt.postgresql.org/pub/repos/apt/ bi
 && apt-get autoremove --yes \
 && rm -rf /var/lib/{apt,dpkg,cache,log}/
 
+# Set up PostGIS
+RUN wget http://download.osgeo.org/postgis/source/postgis-3.0.0rc2.tar.gz
+RUN tar -xvzf postgis-3.0.0rc2.tar.gz
+RUN cd postgis-3.0.0rc2 && ./configure && make && make install
+
 # Set up renderer user
 RUN adduser --disabled-password --gecos "" renderer
 USER renderer
@@ -87,6 +96,8 @@ RUN cmake .. \
   && make -j $(nproc)
 USER root
 RUN make install
+RUN mkdir /nodes \
+    && chown renderer:renderer /nodes
 USER renderer
 
 # Install and test Mapnik
@@ -107,10 +118,11 @@ 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
+RUN npm install -g carto@0.18.2
 USER renderer
 RUN carto project.mml > mapnik.xml
 
@@ -139,12 +151,12 @@ RUN ln -sf /dev/stdout /var/log/apache2/access.log \
   && ln -sf /dev/stderr /var/log/apache2/error.log
 
 # Configure PosgtreSQL
-COPY postgresql.custom.conf.tmpl /etc/postgresql/10/main/
+COPY postgresql.custom.conf.tmpl /etc/postgresql/12/main/
 RUN chown -R postgres:postgres /var/lib/postgresql \
-  && chown postgres:postgres /etc/postgresql/10/main/postgresql.custom.conf.tmpl \
-  && echo "\ninclude 'postgresql.custom.conf'" >> /etc/postgresql/10/main/postgresql.conf
-RUN echo "host all all 0.0.0.0/0 md5" >> /etc/postgresql/10/main/pg_hba.conf \
-      && echo "host all all ::/0 md5" >> /etc/postgresql/10/main/pg_hba.conf
+  && chown postgres:postgres /etc/postgresql/12/main/postgresql.custom.conf.tmpl \
+  && echo "\ninclude 'postgresql.custom.conf'" >> /etc/postgresql/12/main/postgresql.conf
+RUN echo "host all all 0.0.0.0/0 md5" >> /etc/postgresql/12/main/pg_hba.conf \
+      && echo "host all all ::/0 md5" >> /etc/postgresql/12/main/pg_hba.conf
 
 # copy update scripts
 COPY openstreetmap-tiles-update-expire /usr/bin/

Makefile

@@ -8,5 +8,5 @@ push: build
 
 test: build
 	docker volume create openstreetmap-data
-	docker run -v openstreetmap-data:/var/lib/postgresql/10/main overv/openstreetmap-tile-server import
-	docker run -v openstreetmap-data:/var/lib/postgresql/10/main -p 80:80 -d overv/openstreetmap-tile-server run
+	docker run -v openstreetmap-data:/var/lib/postgresql/12/main overv/openstreetmap-tile-server import
+	docker run -v openstreetmap-data:/var/lib/postgresql/12/main -p 80:80 -d overv/openstreetmap-tile-server run

README.md

@@ -13,7 +13,7 @@ Next, download an .osm.pbf extract from geofabrik.de for the region that you're
 ```
 docker run \
     -v /absolute/path/to/luxembourg.osm.pbf:/data.osm.pbf \
-    -v openstreetmap-data:/var/lib/postgresql/10/main \
+    -v openstreetmap-data:/var/lib/postgresql/12/main \
     overv/openstreetmap-tile-server \
     import
 ```
@@ -28,7 +28,7 @@ If your import is an extract of the planet and has polygonal bounds associated w
 docker run \
     -v /absolute/path/to/luxembourg.osm.pbf:/data.osm.pbf \
     -v /absolute/path/to/luxembourg.poly:/data.poly \
-    -v openstreetmap-data:/var/lib/postgresql/10/main \
+    -v openstreetmap-data:/var/lib/postgresql/12/main \
     overv/openstreetmap-tile-server \
     import
 ```
@@ -42,7 +42,7 @@ Run the server like this:
 ```
 docker run \
     -p 80:80 \
-    -v openstreetmap-data:/var/lib/postgresql/10/main \
+    -v openstreetmap-data:/var/lib/postgresql/12/main \
     -d overv/openstreetmap-tile-server \
     run
 ```
@@ -57,12 +57,14 @@ Tiles that have already been rendered will be stored in `/var/lib/mod_tile`. To
 docker volume create openstreetmap-rendered-tiles
 docker run \
     -p 80:80 \
-    -v openstreetmap-data:/var/lib/postgresql/10/main \
+    -v openstreetmap-data:/var/lib/postgresql/12/main \
     -v openstreetmap-rendered-tiles:/var/lib/mod_tile \
     -d overv/openstreetmap-tile-server \
     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`:
@@ -71,7 +73,7 @@ Given that you've specified both the OSM data and polygon as specified in the *A
 docker run \
     -p 80:80 \
     -e UPDATES=enabled \
-    -v openstreetmap-data:/var/lib/postgresql/10/main \
+    -v openstreetmap-data:/var/lib/postgresql/12/main \
     -v openstreetmap-rendered-tiles:/var/lib/mod_tile \
     -d overv/openstreetmap-tile-server \
     run
@@ -86,7 +88,7 @@ To enable the `Access-Control-Allow-Origin` header to be able to retrieve tiles
 ```
 docker run \
     -p 80:80 \
-    -v openstreetmap-data:/var/lib/postgresql/10/main \
+    -v openstreetmap-data:/var/lib/postgresql/12/main \
     -e ALLOW_CORS=1 \
     -d overv/openstreetmap-tile-server \
     run
@@ -100,7 +102,7 @@ To connect to the PostgreSQL database inside the container, make sure to expose
 docker run \
     -p 80:80 \
     -p 5432:5432 \
-    -v openstreetmap-data:/var/lib/postgresql/10/main \
+    -v openstreetmap-data:/var/lib/postgresql/12/main \
     -d overv/openstreetmap-tile-server \
     run
 ```
@@ -118,7 +120,7 @@ docker run \
     -p 80:80 \
     -p 5432:5432 \
     -e PGPASSWORD=secret \
-    -v openstreetmap-data:/var/lib/postgresql/10/main \
+    -v openstreetmap-data:/var/lib/postgresql/12/main \
     -d overv/openstreetmap-tile-server \
     run
 ```
@@ -134,7 +136,19 @@ The import and tile serving processes use 4 threads by default, but this number
 docker run \
     -p 80:80 \
     -e THREADS=24 \
-    -v openstreetmap-data:/var/lib/postgresql/10/main \
+    -v openstreetmap-data:/var/lib/postgresql/12/main \
+    -d overv/openstreetmap-tile-server \
+    run
+```
+
+### CACHE
+
+The import and tile serving processes use 800 MB RAM cache by default, but this number can be changed by option -C. For example:
+```
+docker run \
+    -p 80:80 \
+    -e "OSM2PGSQL_EXTRA_ARGS=-C 4096" \
+    -v openstreetmap-data:/var/lib/postgresql/12/main \
     -d overv/openstreetmap-tile-server \
     run
 ```
@@ -146,33 +160,27 @@ The database use the autovacuum feature by default. This behavior can be changed
 docker run \
     -p 80:80 \
     -e AUTOVACUUM=off \
-    -v openstreetmap-data:/var/lib/postgresql/10/main \
+    -v openstreetmap-data:/var/lib/postgresql/12/main \
     -d overv/openstreetmap-tile-server \
     run
 ```
 
 ### Flat nodes
 
-If you are planning to import the entire planet or you are running into memory errors then you may want to enable the `--flat-nodes` option for osm2pgsql. This option takes a path to a file that must be persisted so we should first set up a volume with the right permissions:
-
-```
-docker run -it -v openstreetmap-nodes:/nodes --entrypoint=bash overv/openstreetmap-tile-server
-$ chown renderer:renderer -R /nodes
-$ exit
-```
-
-You can then use it during the import process as follows:
+If you are planning to import the entire planet or you are running into memory errors then you may want to enable the `--flat-nodes` option for osm2pgsql. You can then use it during the import process as follows:
 
 ```
 docker run \
     -v /absolute/path/to/luxembourg.osm.pbf:/data.osm.pbf \
     -v openstreetmap-nodes:/nodes \
-    -v openstreetmap-data:/var/lib/postgresql/10/main \
+    -v openstreetmap-data:/var/lib/postgresql/12/main \
     -e "OSM2PGSQL_EXTRA_ARGS=--flat-nodes /nodes/flat_nodes.bin" \
     overv/openstreetmap-tile-server \
     import
 ```
 
+>Note that if you use a folder other than `/nodes` then you must make sure that you manually set the owner to `renderer`!
+
 ### Benchmarks
 
 You can find an example of the import performance to expect with this image on the [OpenStreetMap wiki](https://wiki.openstreetmap.org/wiki/Osm2pgsql/benchmarks#debian_9_.2F_openstreetmap-tile-server).
@@ -190,7 +198,7 @@ To raise it use `--shm-size` parameter. For example:
 ```
 docker run \
     -p 80:80 \
-    -v openstreetmap-data:/var/lib/postgresql/10/main \
+    -v openstreetmap-data:/var/lib/postgresql/12/main \
     --shm-size="192m" \
     -d overv/openstreetmap-tile-server \
     run

openstreetmap-tiles-update-expire

@@ -22,7 +22,7 @@ OSM2PGSQL_BIN=osm2pgsql
 TRIM_BIN=/home/$ACCOUNT/src/regional/trim_osc.py
 
 DBNAME=gis
-OSM2PGSQL_OPTIONS="-d $DBNAME -G --hstore --tag-transform-script /home/renderer/src/openstreetmap-carto/openstreetmap-carto.lua -C 2048 --number-processes ${THREADS:-4} -S /home/renderer/src/openstreetmap-carto/openstreetmap-carto.style"
+OSM2PGSQL_OPTIONS="-d $DBNAME -G --hstore  ${OSM2PGSQL_EXTRA_ARGS} --tag-transform-script /home/renderer/src/openstreetmap-carto/openstreetmap-carto.lua --number-processes ${THREADS:-4} -S /home/renderer/src/openstreetmap-carto/openstreetmap-carto.style"
 
 #------------------------------------------------------------------------------
 # When using trim_osc.py we can define either a bounding box (such as this

run.sh

@@ -3,9 +3,9 @@
 set -x
 
 function createPostgresConfig() {
-  cp /etc/postgresql/10/main/postgresql.custom.conf.tmpl /etc/postgresql/10/main/postgresql.custom.conf
-  sudo -u postgres echo "autovacuum = $AUTOVACUUM" >> /etc/postgresql/10/main/postgresql.custom.conf
-  cat /etc/postgresql/10/main/postgresql.custom.conf
+  cp /etc/postgresql/12/main/postgresql.custom.conf.tmpl /etc/postgresql/12/main/postgresql.custom.conf
+  sudo -u postgres echo "autovacuum = $AUTOVACUUM" >> /etc/postgresql/12/main/postgresql.custom.conf
+  cat /etc/postgresql/12/main/postgresql.custom.conf
 }
 
 function setPostgresPassword() {
@@ -56,11 +56,14 @@ if [ "$1" = "import" ]; then
     fi
 
     # Import data
-    sudo -u renderer osm2pgsql -d gis --create --slim -G --hstore --tag-transform-script /home/renderer/src/openstreetmap-carto/openstreetmap-carto.lua -C 2048 --number-processes ${THREADS:-4} ${OSM2PGSQL_EXTRA_ARGS} -S /home/renderer/src/openstreetmap-carto/openstreetmap-carto.style /data.osm.pbf
+    sudo -u renderer osm2pgsql -d gis --create --slim -G --hstore --tag-transform-script /home/renderer/src/openstreetmap-carto/openstreetmap-carto.lua --number-processes ${THREADS:-4} ${OSM2PGSQL_EXTRA_ARGS} -S /home/renderer/src/openstreetmap-carto/openstreetmap-carto.style /data.osm.pbf
 
     # 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
-    sudo -u renderer renderd -f -c /usr/local/etc/renderd.conf
+    # Run while handling docker stop's SIGTERM
+    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