Update NodeJS to 14 LTS (#185)

Upgrade to Ubuntu 20.04

.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

@@ -1,7 +1,7 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 # Based on
-# https://switch2osm.org/manually-building-a-tile-server-18-04-lts/
+# https://switch2osm.org/serving-tiles/manually-building-a-tile-server-18-04-lts/
 
 # Set up environment
 ENV TZ=UTC
@@ -11,28 +11,30 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 # Install dependencies
 RUN apt-get update \
-  && apt-get install wget gnupg2 lsb-core -y \
+  && apt-get install -y wget gnupg2 lsb-core apt-transport-https ca-certificates curl \
   && 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 \
+  && echo "deb [ trusted=yes ] https://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list \
+  && wget --quiet -O - https://deb.nodesource.com/setup_14.x | bash - \
   && apt-get update \
-  && apt-get install -y apt-transport-https ca-certificates \
-  && apt-get install -y --no-install-recommends --allow-unauthenticated \
+  && apt-get install -y nodejs
+
+RUN apt-get install -y --no-install-recommends \
   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 \
@@ -41,141 +43,139 @@ RUN apt-get update \
   libgdal-dev \
   libgeos++-dev \
   libgeos-dev \
-  libgeotiff-epsg \
   libicu-dev \
   liblua5.3-dev \
   libmapnik-dev \
   libpq-dev \
   libproj-dev \
-  libprotobuf-c0-dev \
+  libprotobuf-c-dev \
   libtiff5-dev \
   libtool \
   libxml2-dev \
   lua5.3 \
   make \
   mapnik-utils \
-  nodejs \
-  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 \
+  python3-pip \
   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}/
 
+# Install python libraries
+RUN pip3 install requests \ 
+ && pip3 install pyyaml
+
 # 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
+RUN wget https://download.osgeo.org/postgis/source/postgis-3.1.1.tar.gz -O postgis.tar.gz \
+ && mkdir -p postgis_src \
+ && tar -xvzf postgis.tar.gz --strip 1 -C postgis_src \
+ && rm postgis.tar.gz \
+ && cd postgis_src \
+ && ./configure \
+ && make -j $(nproc) \
+ && make -j $(nproc) 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
-WORKDIR /home/renderer/src
-RUN git clone https://github.com/openstreetmap/osm2pgsql.git
-WORKDIR /home/renderer/src/osm2pgsql
-RUN mkdir build
-WORKDIR /home/renderer/src/osm2pgsql/build
-RUN cmake .. \
-  && make -j $(nproc)
-USER root
-RUN make install
-RUN mkdir /nodes \
-    && chown renderer:renderer /nodes
-USER renderer
-
-# Install and test Mapnik
-RUN python -c 'import mapnik'
+RUN mkdir -p /home/renderer/src \
+ && cd /home/renderer/src \
+ && git clone -b master https://github.com/openstreetmap/osm2pgsql.git --depth 1 \
+ && cd /home/renderer/src/osm2pgsql \
+ && rm -rf .git \
+ && mkdir build \
+ && cd build \
+ && cmake .. \
+ && make -j $(nproc) \
+ && make -j $(nproc) install \
+ && mkdir /nodes \
+ && chown renderer:renderer /nodes \
+ && rm -rf /home/renderer/src/osm2pgsql
 
 # Install mod_tile and renderd
-WORKDIR /home/renderer/src
-RUN git clone -b switch2osm https://github.com/SomeoneElseOSM/mod_tile.git
-WORKDIR /home/renderer/src/mod_tile
-RUN ./autogen.sh \
-  && ./configure \
-  && make -j $(nproc)
-USER root
-RUN make -j $(nproc) install \
-  && make -j $(nproc) install-mod_tile \
-  && ldconfig
-USER renderer
+RUN mkdir -p /home/renderer/src \
+ && cd /home/renderer/src \
+ && git clone -b switch2osm https://github.com/SomeoneElseOSM/mod_tile.git --depth 1 \
+ && cd mod_tile \
+ && rm -rf .git \
+ && ./autogen.sh \
+ && ./configure \
+ && make -j $(nproc) \
+ && make -j $(nproc) install \
+ && make -j $(nproc) install-mod_tile \
+ && ldconfig \
+ && cd ..
 
 # Configure stylesheet
-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
-USER root
-RUN npm install -g carto@0.18.2
-USER renderer
-RUN carto project.mml > mapnik.xml
-
-# Load shapefiles
-WORKDIR /home/renderer/src/openstreetmap-carto
-RUN scripts/get-shapefiles.py
+RUN mkdir -p /home/renderer/src \
+ && cd /home/renderer/src \
+ && git clone --single-branch --branch v5.3.1 https://github.com/gravitystorm/openstreetmap-carto.git --depth 1 \
+ && cd openstreetmap-carto \
+ && rm -rf .git \
+ && npm install -g carto@0.18.2 \
+ && carto project.mml > mapnik.xml 
 
 # 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
-USER renderer
+ && sed -i 's/\/truetype//g' /usr/local/etc/renderd.conf \
+ && sed -i 's/hot/tile/g' /usr/local/etc/renderd.conf
 
 # Configure Apache
-USER root
 RUN mkdir /var/lib/mod_tile \
-  && chown renderer /var/lib/mod_tile \
-  && mkdir /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 headers_module /usr/lib/apache2/modules/mod_headers.so" >> /etc/apache2/conf-available/mod_headers.conf \
-  && a2enconf mod_tile && a2enconf mod_headers
+ && chown renderer /var/lib/mod_tile \
+ && mkdir /var/run/renderd \
+ && chown renderer /var/run/renderd \
+ && 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 \
+ && 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/12/main/
 RUN chown -R postgres:postgres /var/lib/postgresql \
-  && 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
+ && chown postgres:postgres /etc/postgresql/12/main/postgresql.custom.conf.tmpl \
+ && 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 update scripts
 COPY openstreetmap-tiles-update-expire /usr/bin/
 RUN chmod +x /usr/bin/openstreetmap-tiles-update-expire \
-    && mkdir /var/log/tiles \
-    && chmod a+rw /var/log/tiles \
-    && ln -s /home/renderer/src/mod_tile/osmosis-db_replag /usr/bin/osmosis-db_replag \
-    && echo "*  *    * * *   renderer    openstreetmap-tiles-update-expire\n" >> /etc/crontab
+ && mkdir /var/log/tiles \
+ && chmod a+rw /var/log/tiles \
+ && ln -s /home/renderer/src/mod_tile/osmosis-db_replag /usr/bin/osmosis-db_replag \
+ && echo "*  *    * * *   renderer    openstreetmap-tiles-update-expire\n" >> /etc/crontab
 
-# install trim_osc.py helper script
-USER renderer
-RUN cd ~/src \
-    && git clone https://github.com/zverik/regional \
-    && cd regional \
-    && git checkout 612fe3e040d8bb70d2ab3b133f3b2cfc6c940520 \
-    && chmod u+x ~/src/regional/trim_osc.py
+# Install trim_osc.py helper script
+RUN mkdir -p /home/renderer/src \
+ && cd /home/renderer/src \
+ && git clone https://github.com/zverik/regional \
+ && cd regional \
+ && git checkout 889d630a1e1a1bacabdd1dad6e17b49e7d58cd4b \
+ && 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 -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 ${DOCKER_IMAGE} import
+	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,6 +1,8 @@
 # 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.
+[![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/serving-tiles/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
 
@@ -36,19 +38,36 @@ docker run \
 
 Refer to the section *Automatic updating and tile expiry* to actually enable the updates while running the tile server.
 
+### Letting the container download the file
+
+It is also possible to let the container download files for you rather than mounting them in advance by using the `DOWNLOAD_PBF` and `DOWNLOAD_POLY` parameters:
+
+```
+docker run \
+    -e DOWNLOAD_PBF=https://download.geofabrik.de/europe/luxembourg-latest.osm.pbf \
+    -e DOWNLOAD_POLY=https://download.geofabrik.de/europe/luxembourg.poly \
+    -v openstreetmap-data:/var/lib/postgresql/12/main \
+    overv/openstreetmap-tile-server \
+    import
+```
+
 ## Running the server
 
 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
 
@@ -57,7 +76,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 \
@@ -72,7 +91,7 @@ Given that you've set up your import as described in the *Automatic updates* sec
 
 ```
 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 \
@@ -84,13 +103,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
 ```
@@ -101,7 +120,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 \
@@ -118,7 +137,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 \
@@ -135,7 +154,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 \
@@ -147,7 +166,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 \
@@ -159,7 +178,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 \
@@ -198,7 +217,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 \
@@ -219,7 +238,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+    https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

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

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  ${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"
+OSM2PGSQL_OPTIONS="-d $DBNAME -G --hstore --tag-transform-script /home/renderer/src/openstreetmap-carto/openstreetmap-carto.lua --number-processes ${THREADS:-4} -S /home/renderer/src/openstreetmap-carto/openstreetmap-carto.style ${OSM2PGSQL_EXTRA_ARGS}"
 
 #------------------------------------------------------------------------------
 # When using trim_osc.py we can define either a bounding box (such as this
@@ -111,7 +111,7 @@ if [ $# -eq 1 ] ; then
     m_info "Initialising Osmosis replication system to $1"
     mkdir $WORKOSM_DIR
     $OSMOSIS_BIN --read-replication-interval-init workingDirectory=$WORKOSM_DIR 1>&2 2> "$OSMOSISLOG"
-    wget "http://replicate-sequences.osm.mazdermind.de/?"$1"T00:00:00Z" -O $WORKOSM_DIR/state.txt
+    wget "https://replicate-sequences.osm.mazdermind.de/?"$1"T00:00:00Z" -O $WORKOSM_DIR/state.txt
     mv $WORKOSM_DIR/configuration.txt $WORKOSM_DIR/configuration_orig.txt
     sed "s!baseUrl=http://planet.openstreetmap.org/replication/minute!baseUrl=https://planet.openstreetmap.org/replication/minute!" $WORKOSM_DIR/configuration_orig.txt > $WORKOSM_DIR/configuration.txt
 else

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
-  sudo -u postgres echo "autovacuum = $AUTOVACUUM" >> /etc/postgresql/12/main/postgresql.custom.conf
-  cat /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/conf.d/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
@@ -36,10 +42,19 @@ if [ "$1" = "import" ]; then
     setPostgresPassword
 
     # Download Luxembourg as sample if no data is provided
-    if [ ! -f /data.osm.pbf ]; then
+    if [ ! -f /data.osm.pbf ] && [ -z "$DOWNLOAD_PBF" ]; then
         echo "WARNING: No import file at /data.osm.pbf, so importing Luxembourg as example..."
-        wget -nv http://download.geofabrik.de/europe/luxembourg-latest.osm.pbf -O /data.osm.pbf
-        wget -nv http://download.geofabrik.de/europe/luxembourg.poly -O /data.poly
+        DOWNLOAD_PBF="https://download.geofabrik.de/europe/luxembourg-latest.osm.pbf"
+        DOWNLOAD_POLY="https://download.geofabrik.de/europe/luxembourg.poly"
+    fi
+
+    if [ -n "$DOWNLOAD_PBF" ]; then
+        echo "INFO: Download PBF file: $DOWNLOAD_PBF"
+        wget "$WGET_ARGS" "$DOWNLOAD_PBF" -O /data.osm.pbf
+        if [ -n "$DOWNLOAD_POLY" ]; then
+            echo "INFO: Download PBF-POLY file: $DOWNLOAD_POLY"
+            wget "$WGET_ARGS" "$DOWNLOAD_POLY" -O /data.poly
+        fi
     fi
 
     if [ "$UPDATES" = "enabled" ]; then
@@ -58,11 +73,15 @@ 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 --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} -S /home/renderer/src/openstreetmap-carto/openstreetmap-carto.style /data.osm.pbf ${OSM2PGSQL_EXTRA_ARGS}
 
     # Create indexes
     sudo -u postgres psql -d gis -f indexes.sql
  
+    #Import external data
+    sudo chown -R renderer: /home/renderer/src
+    sudo -u renderer python3 /home/renderer/src/openstreetmap-carto/scripts/get-external-data.py -c /home/renderer/src/openstreetmap-carto/external-data.yml -D /home/renderer/src/openstreetmap-carto/data
+
     # Register that data has changed for mod_tile caching purposes
     touch /var/lib/mod_tile/planet-import-complete
 
@@ -79,7 +98,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
 
@@ -93,7 +112,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