Added E flag (#217)

Added -E flag to use the set up environment.

.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,183 +1,213 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04 AS compiler-common
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update \
+&& apt-get install -y --no-install-recommends \
+ git-core \
+ checkinstall \
+ g++ \
+ make \
+ tar \
+ wget \
+ ca-certificates
+
+###########################################################################################################
+
+FROM compiler-common AS compiler-postgis
+RUN apt-get install -y --no-install-recommends \
+ postgresql-server-dev-12 \
+ libxml2-dev \
+ libgeos-dev \
+ libproj-dev
+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 --without-protobuf --without-raster \
+&& make -j $(nproc) \
+&& checkinstall --pkgversion="3.1.1" --install=no --default make install
+
+###########################################################################################################
+
+FROM compiler-common AS compiler-osm2pgsql
+RUN apt-get install -y --no-install-recommends \
+ cmake \
+ libboost-dev \
+ libboost-system-dev \
+ libboost-filesystem-dev \
+ libexpat1-dev \
+ zlib1g-dev \
+ libbz2-dev \
+ libpq-dev \
+ libproj-dev \
+ lua5.3 \
+ liblua5.3-dev \
+ pandoc
+RUN cd ~ \
+&& git clone -b master --single-branch https://github.com/openstreetmap/osm2pgsql.git --depth 1 \
+&& cd osm2pgsql \
+&& mkdir build \
+&& cd build \
+&& cmake .. \
+&& make -j $(nproc) \
+&& checkinstall --pkgversion="1" --install=no --default make install
+
+###########################################################################################################
+
+FROM compiler-common AS compiler-modtile-renderd
+RUN apt-get install -y --no-install-recommends \
+ apache2-dev \
+ automake \
+ autoconf \
+ autotools-dev \
+ libtool \
+ libmapnik-dev
+RUN cd ~ \
+&& git clone -b switch2osm --single-branch https://github.com/SomeoneElseOSM/mod_tile.git --depth 1 \
+&& cd mod_tile \
+&& ./autogen.sh \
+&& ./configure \
+&& make -j $(nproc) \
+&& checkinstall --pkgversion="1" --install=no --pkgname "renderd" --default make install \
+&& checkinstall --pkgversion="1" --install=no --pkgname "mod_tile" --default make install-mod_tile
+
+###########################################################################################################
+
+FROM compiler-common AS compiler-stylesheet
+RUN apt-get install -y --no-install-recommends \
+ npm
+RUN cd ~ \
+&& git clone --single-branch --branch v5.3.1 https://github.com/gravitystorm/openstreetmap-carto.git --depth 1 \
+&& cd openstreetmap-carto \
+&& sed -ie 's#https:\/\/naciscdn.org\/naturalearth\/110m\/cultural\/ne_110m_admin_0_boundary_lines_land.zip#https:\/\/naturalearth.s3.amazonaws.com\/110m_cultural\/ne_110m_admin_0_boundary_lines_land.zip#g' external-data.yml \
+&& npm install -g carto@0.18.2 \
+&& carto project.mml > mapnik.xml
+
+###########################################################################################################
+
+FROM compiler-common AS compiler-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
+
+###########################################################################################################
+
+FROM ubuntu:20.04 AS final-base
 
 # 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/
-
+ENV DEBIAN_FRONTEND=noninteractive
-# Set up environment
-ENV TZ=UTC
 ENV AUTOVACUUM=on
 ENV UPDATES=disabled
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-# Install dependencies
+# Get packages
 RUN apt-get update \
-  && apt-get install wget gnupg2 lsb-core -y \
+&& apt-get install -y --no-install-recommends \
-  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+ apache2 \
-  && echo "deb [ trusted=yes ] http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list \
+ cron \
-  && apt-get update \
+ fonts-noto-cjk \
-  && apt-get install -y apt-transport-https ca-certificates \
+ fonts-noto-hinted \
-  && apt-get install -y --no-install-recommends --allow-unauthenticated \
+ fonts-noto-unhinted \
-  apache2 \
+ gdal-bin \
-  apache2-dev \
+ liblua5.3-dev \
-  autoconf \
+ lua5.3 \
-  build-essential \
+ mapnik-utils \
-  bzip2 \
+ osmium-tool \
-  cmake \
+ osmosis \
-  fonts-noto-cjk \
+ postgresql-12 \
-  fonts-noto-hinted \
+ python-is-python3 \
-  fonts-noto-unhinted \
+ python3-mapnik \
-  clang \
+ python3-lxml \
-  gcc \
+ python3-psycopg2 \
-  gdal-bin \
+ python3-shapely \
-  make \
+ python3-pip \
-  git-core \
+ sudo \
-  libagg-dev \
+ ttf-unifont \
-  libboost-all-dev \
+ wget \
-  libbz2-dev \
-  libcairo-dev \
-  libcairomm-1.0-dev \
-  libexpat1-dev \
-  libfreetype6-dev \
-  libgdal-dev \
-  libgeos++-dev \
-  libgeos-dev \
-  libgeotiff-epsg \
-  libicu-dev \
-  liblua5.3-dev \
-  libmapnik-dev \
-  libpq-dev \
-  libproj-dev \
-  libprotobuf-c0-dev \
-  libtiff5-dev \
-  libtool \
-  libxml2-dev \
-  lua5.3 \
-  make \
-  mapnik-utils \
-  nodejs \
-  npm \
-  postgis \
-  postgresql-12 \
-  postgresql-server-dev-12 \
-  postgresql-contrib-12 \
-  protobuf-c-compiler \
-  python-mapnik \
-  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 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
 
-# Install latest osm2pgsql
+# Install python libraries
-RUN mkdir /home/renderer/src
+RUN pip3 install \
-WORKDIR /home/renderer/src
+ requests \
-RUN git clone https://github.com/openstreetmap/osm2pgsql.git
+ pyyaml
-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'
-
-# 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
-
-# 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
-
-# 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
 
 # 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
+
+# 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
+
+RUN mkdir /nodes \
+&& chown renderer:renderer /nodes
 
 # 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
+&& chown postgres:postgres /etc/postgresql/12/main/postgresql.custom.conf.tmpl \
-RUN echo "host all all 0.0.0.0/0 md5" >> /etc/postgresql/12/main/pg_hba.conf \
+&& 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
+&& echo "host all all ::/0 md5" >> /etc/postgresql/12/main/pg_hba.conf
 
-# 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
 
-# install trim_osc.py helper script
+FROM final-base AS final
-USER renderer
+
-RUN cd ~/src \
+# Install PostGIS
-    && git clone https://github.com/zverik/regional \
+COPY --from=compiler-postgis postgis_src/postgis-src_3.1.1-1_amd64.deb .
-    && cd regional \
+RUN dpkg -i postgis-src_3.1.1-1_amd64.deb \
-    && git checkout 612fe3e040d8bb70d2ab3b133f3b2cfc6c940520 \
+&& rm postgis-src_3.1.1-1_amd64.deb
-    && chmod u+x ~/src/regional/trim_osc.py
+
+# Install osm2pgsql
+COPY --from=compiler-osm2pgsql /root/osm2pgsql/build/build_1-1_amd64.deb .
+RUN dpkg -i build_1-1_amd64.deb \
+&& rm build_1-1_amd64.deb
+
+# Install renderd
+COPY --from=compiler-modtile-renderd /root/mod_tile/renderd_1-1_amd64.deb .
+RUN dpkg -i renderd_1-1_amd64.deb \
+&& rm renderd_1-1_amd64.deb \
+&& sed -i 's/renderaccount/renderer/g' /usr/local/etc/renderd.conf \
+&& sed -i 's/\/truetype//g' /usr/local/etc/renderd.conf \
+&& sed -i 's/hot/tile/g' /usr/local/etc/renderd.conf
+
+# Install mod_tile
+COPY --from=compiler-modtile-renderd /root/mod_tile/mod-tile_1-1_amd64.deb .
+RUN dpkg -i mod-tile_1-1_amd64.deb \
+ && ldconfig \
+ && rm mod-tile_1-1_amd64.deb
+
+# Install stylesheet
+COPY --from=compiler-stylesheet /root/openstreetmap-carto /home/renderer/src/openstreetmap-carto
+
+# Install helper script
+COPY --from=compiler-helper-script /home/renderer/src/regional /home/renderer/src/regional
 
 # Start running
-USER root
 COPY run.sh /
-COPY indexes.sql /
 ENTRYPOINT ["/run.sh"]
 CMD []
-
 EXPOSE 80 5432

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,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

indexes.sql

@@ -1,48 +0,0 @@
--- Extracted from https://github.com/gravitystorm/openstreetmap-carto
--- Comes with a CC0 license
-
--- These are optional but suggested indexes for rendering OpenStreetMap Carto
--- with a full planet database.
--- This file is generated with scripts/indexes.py
-
-CREATE INDEX planet_osm_roads_admin
-  ON planet_osm_roads USING GIST (way)
-  WHERE boundary = 'administrative';
-CREATE INDEX planet_osm_roads_roads_ref
-  ON planet_osm_roads USING GIST (way)
-  WHERE highway IS NOT NULL AND ref IS NOT NULL;
-CREATE INDEX planet_osm_roads_admin_low
-  ON planet_osm_roads USING GIST (way)
-  WHERE boundary = 'administrative' AND admin_level IN ('0', '1', '2', '3', '4');
-CREATE INDEX planet_osm_line_ferry
-  ON planet_osm_line USING GIST (way)
-  WHERE route = 'ferry';
-CREATE INDEX planet_osm_line_river
-  ON planet_osm_line USING GIST (way)
-  WHERE waterway = 'river';
-CREATE INDEX planet_osm_line_name
-  ON planet_osm_line USING GIST (way)
-  WHERE name IS NOT NULL;
-CREATE INDEX planet_osm_polygon_water
-  ON planet_osm_polygon USING GIST (way)
-  WHERE waterway IN ('dock', 'riverbank', 'canal')
-    OR landuse IN ('reservoir', 'basin')
-    OR "natural" IN ('water', 'glacier');
-CREATE INDEX planet_osm_polygon_nobuilding
-  ON planet_osm_polygon USING GIST (way)
-  WHERE building IS NULL;
-CREATE INDEX planet_osm_polygon_name
-  ON planet_osm_polygon USING GIST (way)
-  WHERE name IS NOT NULL;
-CREATE INDEX planet_osm_polygon_way_area_z10
-  ON planet_osm_polygon USING GIST (way)
-  WHERE way_area > 23300;
-CREATE INDEX planet_osm_polygon_military
-  ON planet_osm_polygon USING GIST (way)
-  WHERE (landuse = 'military' OR military = 'danger_area') AND building IS NULL;
-CREATE INDEX planet_osm_polygon_way_area_z6
-  ON planet_osm_polygon USING GIST (way)
-  WHERE way_area > 5980000;
-CREATE INDEX planet_osm_point_place
-  ON planet_osm_point USING GIST (way)
-  WHERE place IS NOT NULL AND name IS NOT NULL;

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

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -x
-
 function createPostgresConfig() {
   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
@@ -23,7 +21,15 @@ if [ "$#" -ne 1 ]; then
     exit 1
 fi
 
+set -x
+
 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
+        DOWNLOAD_PBF="https://download.geofabrik.de/europe/luxembourg-latest.osm.pbf"
-        wget -nv http://download.geofabrik.de/europe/luxembourg.poly -O /data.poly
+        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,10 +73,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 --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
+    sudo -u postgres psql -d gis -f /home/renderer/src/openstreetmap-carto/indexes.sql
+
+    #Import external data
+    sudo chown -R renderer: /home/renderer/src
+    sudo -E -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