Add support for host mounts (fixes #94)

fix configuration values inconsistency

.travis.yml

@@ -0,0 +1,28 @@
+os: linux
+language: minimal
+services:
+- docker
+# DOCKER_USERNAME/DOCKER_PASSWORD have been configured in Travis CI
+# env:
+before_install:
+- echo "Before install"
+before_script:
+- docker pull overv/openstreetmap-tile-server || true
+script:
+- docker build --pull --cache-from overv/openstreetmap-tile-server --tag overv/openstreetmap-tile-server .
+- docker volume create openstreetmap-data
+- docker run --rm -v openstreetmap-data:/var/lib/postgresql/12/main overv/openstreetmap-tile-server import
+- docker run --rm -v openstreetmap-data:/var/lib/postgresql/12/main -p 8080:80 -d overv/openstreetmap-tile-server run
+- sleep 30
+- make DOCKER_IMAGE=overv/openstreetmap-tile-server stop
+after_script:
+- docker images
+after_success:
+- if [[ "$TRAVIS_BRANCH" == "master" ]];
+  then
+  docker images ;
+  echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin ;
+  docker push overv/openstreetmap-tile-server ;
+  fi
+notifications:
+  email: true

Dockerfile

@@ -10,29 +10,34 @@ ENV UPDATES=disabled
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 # Install dependencies
-RUN apt-get update \ 
+RUN apt-get update \
-  && apt-get install wget gnupg2 lsb-core -y \   
+  && 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 apt-transport-https ca-certificates 
-  && apt-get install -y --no-install-recommends --allow-unauthenticated \
+
+RUN apt-get install -y curl \
+  && wget --quiet -O - https://deb.nodesource.com/setup_10.x | bash - \
+  && apt-get install -y nodejs
+
+RUN apt-get install -y --no-install-recommends --allow-unauthenticated \
   apache2 \
   apache2-dev \
   autoconf \
   build-essential \
   bzip2 \
   cmake \
+  cron \
   fonts-noto-cjk \
   fonts-noto-hinted \
   fonts-noto-unhinted \
-  clang \
   gcc \
   gdal-bin \
-  make \
   git-core \
   libagg-dev \
-  libboost-all-dev \
+  libboost-filesystem-dev \
+  libboost-system-dev \
   libbz2-dev \
   libcairo-dev \
   libcairomm-1.0-dev \
@@ -54,128 +59,122 @@ RUN apt-get update \
   lua5.3 \
   make \
   mapnik-utils \
-  nodejs \
+  node-gyp \
-  npm \
+  osmium-tool \
+  osmosis \
   postgis \
   postgresql-12 \
-  postgresql-server-dev-12 \
   postgresql-contrib-12 \
+  postgresql-server-dev-12 \
   protobuf-c-compiler \
-  python-mapnik \
+  python3-mapnik \
+  python3-lxml \
+  python3-psycopg2 \
+  python3-shapely \
   sudo \
   tar \
   ttf-unifont \
   unzip \
   wget \
   zlib1g-dev \
-  osmosis \
-  osmium-tool \
-  cron \
-  python3-psycopg2 python3-shapely python3-lxml \
 && apt-get clean autoclean \
 && 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 wget http://download.osgeo.org/postgis/source/postgis-3.0.0.tar.gz -O postgis.tar.gz \
-RUN tar -xvzf postgis-3.0.0rc2.tar.gz
+ && mkdir -p postgis_src \
-RUN cd postgis-3.0.0rc2 && ./configure && make && make install
+ && tar -xvzf postgis.tar.gz --strip 1 -C postgis_src \
+ && rm postgis.tar.gz \
+ && cd postgis_src \
+ && ./configure && make && make install \
+ && cd .. && rm -rf postgis_src
 
 # Set up renderer user
 RUN adduser --disabled-password --gecos "" renderer
-USER renderer
 
 # Install latest osm2pgsql
-RUN mkdir /home/renderer/src
+RUN mkdir -p /home/renderer/src \
-WORKDIR /home/renderer/src
+ && cd /home/renderer/src \
-RUN git clone https://github.com/openstreetmap/osm2pgsql.git
+ && git clone https://github.com/openstreetmap/osm2pgsql.git \
-WORKDIR /home/renderer/src/osm2pgsql
+ && cd /home/renderer/src/osm2pgsql \
-RUN mkdir build
+ && rm -rf .git \
-WORKDIR /home/renderer/src/osm2pgsql/build
+ && mkdir build \
-RUN cmake .. \
+ && cd build \
-  && make -j $(nproc)
+ && cmake .. \
-USER root
+ && make -j $(nproc) \
-RUN make install
+ && make install \
-RUN mkdir /nodes \
+ && mkdir /nodes \
-    && chown renderer:renderer /nodes
+ && chown renderer:renderer /nodes \
-USER renderer
+ && rm -rf /home/renderer/src/osm2pgsql
-
-# Install and test Mapnik
-RUN python -c 'import mapnik'
 
 # Install mod_tile and renderd
-WORKDIR /home/renderer/src
+RUN mkdir -p /home/renderer/src \
-RUN git clone -b switch2osm https://github.com/SomeoneElseOSM/mod_tile.git
+ && cd /home/renderer/src \
-WORKDIR /home/renderer/src/mod_tile
+ && git clone -b switch2osm https://github.com/SomeoneElseOSM/mod_tile.git \
-RUN ./autogen.sh \
+ && cd mod_tile \
-  && ./configure \
+ && ./autogen.sh \
-  && make -j $(nproc)
+ && ./configure \
-USER root
+ && make -j $(nproc) \
-RUN make -j $(nproc) install \
+ && make -j $(nproc) install \
-  && make -j $(nproc) install-mod_tile \
+ && make -j $(nproc) install-mod_tile \
-  && ldconfig
+ && ldconfig \
-USER renderer
+ && cd ..
 
 # Configure stylesheet
-WORKDIR /home/renderer/src
+RUN mkdir -p /home/renderer/src \
-RUN git clone https://github.com/gravitystorm/openstreetmap-carto.git \
+ && cd /home/renderer/src \
- && git -C openstreetmap-carto checkout v4.23.0
+ && git clone https://github.com/gravitystorm/openstreetmap-carto.git \
-WORKDIR /home/renderer/src/openstreetmap-carto
+ && git -C openstreetmap-carto checkout v4.23.0 \
-USER root
+ && cd openstreetmap-carto \
-RUN npm install -g carto@0.18.2
+ && rm -rf .git \
-USER renderer
+ && npm install -g carto@0.18.2 \
-RUN carto project.mml > mapnik.xml
+ && carto project.mml > mapnik.xml \
-
+ && scripts/get-shapefiles.py \
-# Load shapefiles
+ && rm /home/renderer/src/openstreetmap-carto/data/*.zip
-WORKDIR /home/renderer/src/openstreetmap-carto
-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
-USER renderer
 
 # Configure Apache
-USER root
 RUN mkdir /var/lib/mod_tile \
-  && chown renderer /var/lib/mod_tile \
+ && chown renderer /var/lib/mod_tile \
-  && mkdir /var/run/renderd \
+ && mkdir /var/run/renderd \
-  && chown renderer /var/run/renderd
+ && chown renderer /var/run/renderd \
-RUN echo "LoadModule tile_module /usr/lib/apache2/modules/mod_tile.so" >> /etc/apache2/conf-available/mod_tile.conf \
+ && echo "LoadModule tile_module /usr/lib/apache2/modules/mod_tile.so" >> /etc/apache2/conf-available/mod_tile.conf \
-    && echo "LoadModule headers_module /usr/lib/apache2/modules/mod_headers.so" >> /etc/apache2/conf-available/mod_headers.conf \
+ && echo "LoadModule headers_module /usr/lib/apache2/modules/mod_headers.so" >> /etc/apache2/conf-available/mod_headers.conf \
-  && a2enconf mod_tile && a2enconf mod_headers
+ && a2enconf mod_tile && a2enconf mod_headers
 COPY apache.conf /etc/apache2/sites-available/000-default.conf
 COPY leaflet-demo.html /var/www/html/index.html
 RUN ln -sf /dev/stdout /var/log/apache2/access.log \
-  && ln -sf /dev/stderr /var/log/apache2/error.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 \
+ && chown postgres:postgres /etc/postgresql/12/main/postgresql.custom.conf.tmpl \
-  && echo "\ninclude 'postgresql.custom.conf'" >> /etc/postgresql/10/main/postgresql.conf
+ && echo "host all all 0.0.0.0/0 md5" >> /etc/postgresql/12/main/pg_hba.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/12/main/pg_hba.conf
-      && echo "host all all ::/0 md5" >> /etc/postgresql/10/main/pg_hba.conf
 
-# copy update scripts
+# Copy update scripts
 COPY openstreetmap-tiles-update-expire /usr/bin/
 RUN chmod +x /usr/bin/openstreetmap-tiles-update-expire \
-    && mkdir /var/log/tiles \
+ && mkdir /var/log/tiles \
-    && chmod a+rw /var/log/tiles \
+ && chmod a+rw /var/log/tiles \
-    && ln -s /home/renderer/src/mod_tile/osmosis-db_replag /usr/bin/osmosis-db_replag \
+ && ln -s /home/renderer/src/mod_tile/osmosis-db_replag /usr/bin/osmosis-db_replag \
-    && echo "*  *    * * *   renderer    openstreetmap-tiles-update-expire\n" >> /etc/crontab
+ && echo "*  *    * * *   renderer    openstreetmap-tiles-update-expire\n" >> /etc/crontab
 
-# install trim_osc.py helper script
+# Install trim_osc.py helper script
-USER renderer
+RUN mkdir -p /home/renderer/src \
-RUN cd ~/src \
+ && cd /home/renderer/src \
-    && git clone https://github.com/zverik/regional \
+ && git clone https://github.com/zverik/regional \
-    && cd regional \
+ && cd regional \
-    && git checkout 612fe3e040d8bb70d2ab3b133f3b2cfc6c940520 \
+ && git checkout 612fe3e040d8bb70d2ab3b133f3b2cfc6c940520 \
-    && chmod u+x ~/src/regional/trim_osc.py
+ && rm -rf .git \
+ && chmod u+x /home/renderer/src/regional/trim_osc.py
 
 # Start running
-USER root
 COPY run.sh /
 COPY indexes.sql /
 ENTRYPOINT ["/run.sh"]

Makefile

@@ -1,12 +1,18 @@
 .PHONY: build push test
 
+DOCKER_IMAGE=overv/openstreetmap-tile-server
+
 build:
-	docker build -t overv/openstreetmap-tile-server .
+	docker build -t ${DOCKER_IMAGE} .
 
 push: build
-	docker push overv/openstreetmap-tile-server:latest
+	docker push ${DOCKER_IMAGE}:latest
 
 test: build
 	docker volume create openstreetmap-data
-	docker run -v openstreetmap-data:/var/lib/postgresql/12/main overv/openstreetmap-tile-server import
+	docker run --rm -v openstreetmap-data:/var/lib/postgresql/12/main ${DOCKER_IMAGE} import
-	docker run -v openstreetmap-data:/var/lib/postgresql/12/main -p 80:80 -d overv/openstreetmap-tile-server run
+	docker run --rm -v openstreetmap-data:/var/lib/postgresql/12/main -p 8080:80 -d ${DOCKER_IMAGE} run
+
+stop:
+	docker rm -f `docker ps | grep '${DOCKER_IMAGE}' | awk '{ print $$1 }'` || true
+	docker volume rm -f openstreetmap-data

README.md

@@ -1,5 +1,7 @@
 # openstreetmap-tile-server
 
+[![Build Status](https://travis-ci.org/Overv/openstreetmap-tile-server.svg?branch=master)](https://travis-ci.org/Overv/openstreetmap-tile-server) [![](https://images.microbadger.com/badges/image/overv/openstreetmap-tile-server.svg)](https://microbadger.com/images/overv/openstreetmap-tile-server "openstreetmap-tile-server")
+
 This container allows you to easily set up an OpenStreetMap PNG tile server given a `.osm.pbf` file. It is based on the [latest Ubuntu 18.04 LTS guide](https://switch2osm.org/manually-building-a-tile-server-18-04-lts/) from [switch2osm.org](https://switch2osm.org/) and therefore uses the default OpenStreetMap style.
 
 ## Setting up the server
@@ -22,10 +24,11 @@ If the container exits without errors, then your data has been successfully impo
 
 ### Automatic updates (optional)
 
-If your import is an extract of the planet and has polygonal bounds associated with it, like those from geofabrik.de, then it is possible to set your server up for automatic updates. Make sure to reference both the OSM file and the polygon file during the import process to facilitate this:
+If your import is an extract of the planet and has polygonal bounds associated with it, like those from geofabrik.de, then it is possible to set your server up for automatic updates. Make sure to reference both the OSM file and the polygon file during the import process to facilitate this, and also include the `UPDATES=enabled` variable:
 
 ```
 docker run \
+    -e UPDATES=enabled \
     -v /absolute/path/to/luxembourg.osm.pbf:/data.osm.pbf \
     -v /absolute/path/to/luxembourg.poly:/data.poly \
     -v openstreetmap-data:/var/lib/postgresql/12/main \
@@ -33,7 +36,7 @@ docker run \
     import
 ```
 
-Refer to the section *Automatic updating and tile expiry* to actually enable the updates.
+Refer to the section *Automatic updating and tile expiry* to actually enable the updates while running the tile server.
 
 ## Running the server
 
@@ -41,13 +44,17 @@ Run the server like this:
 
 ```
 docker run \
-    -p 80:80 \
+    -p 8080:80 \
     -v openstreetmap-data:/var/lib/postgresql/12/main \
     -d overv/openstreetmap-tile-server \
     run
 ```
 
-Your tiles will now be available at `http://localhost:80/tile/{z}/{x}/{y}.png`. The demo map in `leaflet-demo.html` will then be available on `http://localhost:80`. Note that it will initially take quite a bit of time to render the larger tiles for the first time.
+Your tiles will now be available at `http://localhost:8080/tile/{z}/{x}/{y}.png`. The demo map in `leaflet-demo.html` will then be available on `http://localhost:8080`. Note that it will initially take quite a bit of time to render the larger tiles for the first time.
+
+### Using Docker Compose
+
+The `docker-compose.yml` file included with this repository shows how the aforementioned command can be used with Docker Compose to run your server.
 
 ### Preserving rendered tiles
 
@@ -56,7 +63,7 @@ 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 \
+    -p 8080:80 \
     -v openstreetmap-data:/var/lib/postgresql/12/main \
     -v openstreetmap-rendered-tiles:/var/lib/mod_tile \
     -d overv/openstreetmap-tile-server \
@@ -67,11 +74,11 @@ docker run \
 
 ### 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`:
+Given that you've set up your import as described in the *Automatic updates* section during server setup, you can enable the updating process by setting the `UPDATES` variable while running your server as well:
 
 ```
 docker run \
-    -p 80:80 \
+    -p 8080:80 \
     -e UPDATES=enabled \
     -v openstreetmap-data:/var/lib/postgresql/12/main \
     -v openstreetmap-rendered-tiles:/var/lib/mod_tile \
@@ -83,13 +90,13 @@ This will enable a background process that automatically downloads changes from
 
 ### Cross-origin resource sharing
 
-To enable the `Access-Control-Allow-Origin` header to be able to retrieve tiles from other domains, simply set the `ALLOW_CORS` variable to `1`:
+To enable the `Access-Control-Allow-Origin` header to be able to retrieve tiles from other domains, simply set the `ALLOW_CORS` variable to `enabled`:
 
 ```
 docker run \
-    -p 80:80 \
+    -p 8080:80 \
     -v openstreetmap-data:/var/lib/postgresql/12/main \
-    -e ALLOW_CORS=1 \
+    -e ALLOW_CORS=enabled \
     -d overv/openstreetmap-tile-server \
     run
 ```
@@ -100,7 +107,7 @@ To connect to the PostgreSQL database inside the container, make sure to expose
 
 ```
 docker run \
-    -p 80:80 \
+    -p 8080:80 \
     -p 5432:5432 \
     -v openstreetmap-data:/var/lib/postgresql/12/main \
     -d overv/openstreetmap-tile-server \
@@ -117,7 +124,7 @@ The default password is `renderer`, but it can be changed using the `PGPASSWORD`
 
 ```
 docker run \
-    -p 80:80 \
+    -p 8080:80 \
     -p 5432:5432 \
     -e PGPASSWORD=secret \
     -v openstreetmap-data:/var/lib/postgresql/12/main \
@@ -134,7 +141,7 @@ Details for update procedure and invoked scripts can be found here [link](https:
 The import and tile serving processes use 4 threads by default, but this number can be changed by setting the `THREADS` environment variable. For example:
 ```
 docker run \
-    -p 80:80 \
+    -p 8080:80 \
     -e THREADS=24 \
     -v openstreetmap-data:/var/lib/postgresql/12/main \
     -d overv/openstreetmap-tile-server \
@@ -146,7 +153,7 @@ docker run \
 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 \
+    -p 8080:80 \
     -e "OSM2PGSQL_EXTRA_ARGS=-C 4096" \
     -v openstreetmap-data:/var/lib/postgresql/12/main \
     -d overv/openstreetmap-tile-server \
@@ -158,7 +165,7 @@ docker run \
 The database use the autovacuum feature by default. This behavior can be changed with `AUTOVACUUM` environment variable. For example:
 ```
 docker run \
-    -p 80:80 \
+    -p 8080:80 \
     -e AUTOVACUUM=off \
     -v openstreetmap-data:/var/lib/postgresql/12/main \
     -d overv/openstreetmap-tile-server \
@@ -197,7 +204,7 @@ renderd[121]: reason: Postgis Plugin: ERROR: could not resize shared memory segm
 To raise it use `--shm-size` parameter. For example:
 ```
 docker run \
-    -p 80:80 \
+    -p 8080:80 \
     -v openstreetmap-data:/var/lib/postgresql/12/main \
     --shm-size="192m" \
     -d overv/openstreetmap-tile-server \

docker-compose.yml

@@ -0,0 +1,14 @@
+version: '3'
+
+services:
+  map:
+    image: overv/openstreetmap-tile-server
+    volumes:
+      - openstreetmap-data:/var/lib/postgresql/12/main
+    ports:
+      - "8080:80"
+    command: "run"
+
+volumes:
+  openstreetmap-data:
+    external: true

run.sh

@@ -3,9 +3,9 @@
 set -x
 
 function createPostgresConfig() {
-  cp /etc/postgresql/12/main/postgresql.custom.conf.tmpl /etc/postgresql/12/main/postgresql.custom.conf
+  cp /etc/postgresql/12/main/postgresql.custom.conf.tmpl /etc/postgresql/12/main/conf.d/postgresql.custom.conf
-  sudo -u postgres echo "autovacuum = $AUTOVACUUM" >> /etc/postgresql/12/main/postgresql.custom.conf
+  sudo -u postgres echo "autovacuum = $AUTOVACUUM" >> /etc/postgresql/12/main/conf.d/postgresql.custom.conf
-  cat /etc/postgresql/12/main/postgresql.custom.conf
+  cat /etc/postgresql/12/main/conf.d/postgresql.custom.conf
 }
 
 function setPostgresPassword() {
@@ -24,6 +24,12 @@ if [ "$#" -ne 1 ]; then
 fi
 
 if [ "$1" = "import" ]; then
+    # Ensure that database directory is in right state
+    chown postgres:postgres -R /var/lib/postgresql
+    if [ ! -f /var/lib/postgresql/12/main/PG_VERSION ]; then
+        sudo -u postgres /usr/lib/postgresql/12/bin/pg_ctl -D /var/lib/postgresql/12/main/ initdb -o "--locale C.UTF-8"
+    fi
+
     # Initialize PostgreSQL
     createPostgresConfig
     service postgresql start
@@ -42,13 +48,15 @@ if [ "$1" = "import" ]; then
         wget -nv http://download.geofabrik.de/europe/luxembourg.poly -O /data.poly
     fi
 
-    # determine and set osmosis_replication_timestamp (for consecutive updates)
+    if [ "$UPDATES" = "enabled" ]; then
-    osmium fileinfo /data.osm.pbf > /var/lib/mod_tile/data.osm.pbf.info
+        # determine and set osmosis_replication_timestamp (for consecutive updates)
-    osmium fileinfo /data.osm.pbf | grep 'osmosis_replication_timestamp=' | cut -b35-44 > /var/lib/mod_tile/replication_timestamp.txt
+        osmium fileinfo /data.osm.pbf > /var/lib/mod_tile/data.osm.pbf.info
-    REPLICATION_TIMESTAMP=$(cat /var/lib/mod_tile/replication_timestamp.txt)
+        osmium fileinfo /data.osm.pbf | grep 'osmosis_replication_timestamp=' | cut -b35-44 > /var/lib/mod_tile/replication_timestamp.txt
+        REPLICATION_TIMESTAMP=$(cat /var/lib/mod_tile/replication_timestamp.txt)
 
-    # initial setup of osmosis workspace (for consecutive updates)
+        # initial setup of osmosis workspace (for consecutive updates)
-    sudo -u renderer openstreetmap-tiles-update-expire $REPLICATION_TIMESTAMP
+        sudo -u renderer openstreetmap-tiles-update-expire $REPLICATION_TIMESTAMP
+    fi
 
     # copy polygon file if available
     if [ -f /data.poly ]; then
@@ -77,7 +85,7 @@ if [ "$1" = "run" ]; then
     chown postgres:postgres /var/lib/postgresql -R
 
     # Configure Apache CORS
-    if [ "$ALLOW_CORS" == "1" ]; then
+    if [ "$ALLOW_CORS" == "enabled" ] || [ "$ALLOW_CORS" == "1" ]; then
         echo "export APACHE_ARGUMENTS='-D ALLOW_CORS'" >> /etc/apache2/envvars
     fi
 
@@ -91,7 +99,7 @@ if [ "$1" = "run" ]; then
     sed -i -E "s/num_threads=[0-9]+/num_threads=${THREADS:-4}/g" /usr/local/etc/renderd.conf
 
     # start cron job to trigger consecutive updates
-    if [ "$UPDATES" = "enabled" ]; then
+    if [ "$UPDATES" = "enabled" ] || [ "$UPDATES" = "1" ]; then
       /etc/init.d/cron start
     fi