From cefc97edd3827f989a74238bb10d390f0839ccc8 Mon Sep 17 00:00:00 2001
From: hhansen06 <hhansen06@googlemail.com>
Date: Fri, 11 Jan 2019 20:36:30 +0100
Subject: [PATCH 01/21] Update leaflet-demo.html

---
 leaflet-demo.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/leaflet-demo.html b/leaflet-demo.html
index c3b626b..82d09a8 100644
--- a/leaflet-demo.html
+++ b/leaflet-demo.html
@@ -25,7 +25,7 @@
         <script>
             var map = L.map('map').setView([0, 0], 3);
 
-            L.tileLayer('http://localhost/tile/{z}/{x}/{y}.png', {
+            L.tileLayer('/tile/{z}/{x}/{y}.png', {
                 maxZoom: 18,
                 attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
                 id: 'base'

From 6d57819daa236dab3c9c7268daac114f36e614ac Mon Sep 17 00:00:00 2001
From: hhansen06 <hhansen06@googlemail.com>
Date: Fri, 11 Jan 2019 20:37:31 +0100
Subject: [PATCH 02/21] Update Dockerfile

---
 Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 810fd9a..453f752 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -83,6 +83,8 @@ RUN chown renderer /var/run/renderd
 RUN echo "LoadModule tile_module /usr/lib/apache2/modules/mod_tile.so" >> /etc/apache2/conf-available/mod_tile.conf
 RUN a2enconf mod_tile
 COPY apache.conf /etc/apache2/sites-available/000-default.conf
+COPY leaflet-demo.html /var/www/html/index.html
+
 USER renderer
 
 # Install PostgreSQL
@@ -95,4 +97,4 @@ USER root
 RUN apt-get install -y sudo
 COPY run.sh /
 ENTRYPOINT ["/run.sh"]
-CMD []
\ No newline at end of file
+CMD []

From e37c31d2f0556f950db23f909d62b18cd3e60005 Mon Sep 17 00:00:00 2001
From: Grzegorz Adam Kowalski <grzegorz.adam.kowalski@outlook.com>
Date: Thu, 14 Mar 2019 10:42:58 +0100
Subject: [PATCH 03/21] stop postgresql to prevent database corruption

---
 run.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/run.sh b/run.sh
index 353c9bd..701d33e 100755
--- a/run.sh
+++ b/run.sh
@@ -28,6 +28,7 @@ if [ "$1" = "import" ]; then
 
     # 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} -S /home/renderer/src/openstreetmap-carto/openstreetmap-carto.style /data.osm.pbf
+    service postgresql stop
 
     exit 0
 fi
@@ -42,9 +43,10 @@ if [ "$1" = "run" ]; then
 
     # Run
     sudo -u renderer renderd -f -c /usr/local/etc/renderd.conf
+    service postgresql stop
 
     exit 0
 fi
 
 echo "invalid command"
-exit 1
\ No newline at end of file
+exit 1

From c8a5c771ac1871ab810b4251078b75b627e51d36 Mon Sep 17 00:00:00 2001
From: Grzegorz Adam Kowalski <grzegorz.adam.kowalski@outlook.com>
Date: Thu, 14 Mar 2019 11:52:16 +0100
Subject: [PATCH 04/21] Expose webserver and DB ports

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 453f752..730d210 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -98,3 +98,5 @@ RUN apt-get install -y sudo
 COPY run.sh /
 ENTRYPOINT ["/run.sh"]
 CMD []
+
+EXPOSE 80 5432

From 95e5fa8a96d3b1e6effc1c164543f6adc78eeba9 Mon Sep 17 00:00:00 2001
From: Grzegorz Adam Kowalski <grzegorz.adam.kowalski@outlook.com>
Date: Thu, 14 Mar 2019 12:24:17 +0100
Subject: [PATCH 05/21] cache-busting

https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#apt-get
---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 730d210..4bcbb4b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,8 +4,7 @@ FROM ubuntu:18.04
 # https://switch2osm.org/manually-building-a-tile-server-18-04-lts/
 
 # Install dependencies
-RUN apt-get update
-RUN apt-get install -y libboost-all-dev git-core tar unzip wget bzip2 build-essential autoconf libtool libxml2-dev libgeos-dev libgeos++-dev libpq-dev libbz2-dev libproj-dev munin-node munin libprotobuf-c0-dev protobuf-c-compiler libfreetype6-dev libtiff5-dev libicu-dev libgdal-dev libcairo-dev libcairomm-1.0-dev apache2 apache2-dev libagg-dev liblua5.2-dev ttf-unifont lua5.1 liblua5.1-dev libgeotiff-epsg
+RUN apt-get update && apt-get install -y libboost-all-dev git-core tar unzip wget bzip2 build-essential autoconf libtool libxml2-dev libgeos-dev libgeos++-dev libpq-dev libbz2-dev libproj-dev munin-node munin libprotobuf-c0-dev protobuf-c-compiler libfreetype6-dev libtiff5-dev libicu-dev libgdal-dev libcairo-dev libcairomm-1.0-dev apache2 apache2-dev libagg-dev liblua5.2-dev ttf-unifont lua5.1 liblua5.1-dev libgeotiff-epsg
 
 # Set up environment and renderer user
 ENV TZ=UTC

From dbbe98aaed526e6579c00cdfad0323fbbd5e7ed4 Mon Sep 17 00:00:00 2001
From: Grzegorz Adam Kowalski <grzegorz.adam.kowalski@outlook.com>
Date: Thu, 14 Mar 2019 15:45:25 +0100
Subject: [PATCH 06/21] apt-get dependency cleanup

---
 Dockerfile | 79 +++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 57 insertions(+), 22 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4bcbb4b..229481e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,63 @@ FROM ubuntu:18.04
 # https://switch2osm.org/manually-building-a-tile-server-18-04-lts/
 
 # Install dependencies
-RUN apt-get update && apt-get install -y libboost-all-dev git-core tar unzip wget bzip2 build-essential autoconf libtool libxml2-dev libgeos-dev libgeos++-dev libpq-dev libbz2-dev libproj-dev munin-node munin libprotobuf-c0-dev protobuf-c-compiler libfreetype6-dev libtiff5-dev libicu-dev libgdal-dev libcairo-dev libcairomm-1.0-dev apache2 apache2-dev libagg-dev liblua5.2-dev ttf-unifont lua5.1 liblua5.1-dev libgeotiff-epsg
+RUN apt-get update && apt-get install -y \
+  apache2 \
+  apache2-dev \
+  autoconf \
+  build-essential \
+  bzip2 \
+  cmake \
+  fonts-noto-cjk \
+  fonts-noto-hinted \
+  fonts-noto-unhinted \
+  g++ \
+  gdal-bin \
+  git-core \
+  libagg-dev \
+  libboost-all-dev \
+  libboost-dev \
+  libboost-filesystem-dev \
+  libboost-system-dev \
+  libbz2-dev \
+  libcairo-dev \
+  libcairomm-1.0-dev \
+  libexpat1-dev \
+  libfreetype6-dev \
+  libgdal-dev \
+  libgeos++-dev \
+  libgeos-dev \
+  libgeotiff-epsg \
+  libicu-dev \
+  liblua5.1-dev \
+  liblua5.2-dev \
+  libmapnik-dev \
+  libpq-dev \
+  libproj-dev \
+  libprotobuf-c0-dev \
+  libtiff5-dev \
+  libtool \
+  libxml2-dev \
+  lua5.1 \
+  lua5.2 \
+  make \
+  mapnik-utils \
+  munin \
+  munin-node \
+  nodejs \
+  npm \
+  postgis \
+  postgresql \
+  postgresql-10-postgis-2.4 \
+  postgresql-contrib \
+  protobuf-c-compiler \
+  python-mapnik \
+  sudo \
+  tar \
+  ttf-unifont \
+  unzip \
+  wget \
+  zlib1g-dev
 
 # Set up environment and renderer user
 ENV TZ=UTC
@@ -17,9 +73,6 @@ RUN mkdir /home/renderer/src
 WORKDIR /home/renderer/src
 RUN git clone https://github.com/openstreetmap/osm2pgsql.git
 WORKDIR /home/renderer/src/osm2pgsql
-USER root
-RUN apt-get install -y make cmake g++ libboost-dev libboost-system-dev libboost-filesystem-dev libexpat1-dev zlib1g-dev libbz2-dev libpq-dev libgeos-dev libgeos++-dev libproj-dev lua5.2 liblua5.2-dev
-USER renderer
 RUN mkdir build
 WORKDIR /home/renderer/src/osm2pgsql/build
 RUN cmake ..
@@ -29,9 +82,6 @@ RUN make install
 USER renderer
 
 # Install and test Mapnik
-USER root
-RUN apt-get -y install autoconf apache2-dev libtool libxml2-dev libbz2-dev libgeos-dev libgeos++-dev libproj-dev gdal-bin libmapnik-dev mapnik-utils python-mapnik
-USER renderer
 RUN python -c 'import mapnik'
 
 # Install mod_tile and renderd
@@ -52,7 +102,6 @@ WORKDIR /home/renderer/src
 RUN git clone https://github.com/gravitystorm/openstreetmap-carto.git
 WORKDIR /home/renderer/src/openstreetmap-carto
 USER root
-RUN apt-get install -y npm nodejs
 RUN npm install -g carto
 USER renderer
 RUN carto -v
@@ -62,11 +111,6 @@ RUN carto project.mml > mapnik.xml
 WORKDIR /home/renderer/src/openstreetmap-carto
 RUN scripts/get-shapefiles.py
 
-# Install fonts
-USER root
-RUN apt-get install -y fonts-noto-cjk fonts-noto-hinted fonts-noto-unhinted ttf-unifont
-USER renderer
-
 # Configure renderd
 USER root
 RUN sed -i 's/renderaccount/renderer/g' /usr/local/etc/renderd.conf
@@ -84,16 +128,7 @@ RUN a2enconf mod_tile
 COPY apache.conf /etc/apache2/sites-available/000-default.conf
 COPY leaflet-demo.html /var/www/html/index.html
 
-USER renderer
-
-# Install PostgreSQL
-USER root
-RUN apt-get install -y postgresql postgresql-contrib postgis postgresql-10-postgis-2.4
-USER renderer
-
 # Start running
-USER root
-RUN apt-get install -y sudo
 COPY run.sh /
 ENTRYPOINT ["/run.sh"]
 CMD []

From 7875c4492eb3273b9cd9e843712535d0acdb1f70 Mon Sep 17 00:00:00 2001
From: Grzegorz Adam Kowalski <grzegorz.adam.kowalski@outlook.com>
Date: Thu, 14 Mar 2019 15:56:07 +0100
Subject: [PATCH 07/21] Timezone setup before apt-get tzdata

---
 Dockerfile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 229481e..7462ddf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,10 @@ FROM ubuntu:18.04
 # Based on
 # https://switch2osm.org/manually-building-a-tile-server-18-04-lts/
 
+# Set up environment
+ENV TZ=UTC
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
 # Install dependencies
 RUN apt-get update && apt-get install -y \
   apache2 \
@@ -62,9 +66,7 @@ RUN apt-get update && apt-get install -y \
   wget \
   zlib1g-dev
 
-# Set up environment and renderer user
-ENV TZ=UTC
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+# Set up renderer user
 RUN adduser --disabled-password --gecos "" renderer
 USER renderer
 

From a0728026b2b04c8de6492ef78ac443a02aec8afd Mon Sep 17 00:00:00 2001
From: Grzegorz Adam Kowalski <grzegorz.adam.kowalski@outlook.com>
Date: Thu, 14 Mar 2019 16:17:49 +0100
Subject: [PATCH 08/21] Remove `carto -v` as not needed

npm install prints out version anyway
---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7462ddf..4745247 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -106,7 +106,6 @@ WORKDIR /home/renderer/src/openstreetmap-carto
 USER root
 RUN npm install -g carto
 USER renderer
-RUN carto -v
 RUN carto project.mml > mapnik.xml
 
 # Load shapefiles

From 7e87c26e0e46f80743147c7f129c9a6b654a4518 Mon Sep 17 00:00:00 2001
From: Grzegorz Adam Kowalski <grzegorz.adam.kowalski@outlook.com>
Date: Thu, 14 Mar 2019 23:20:06 +0100
Subject: [PATCH 09/21] Removed munin from apt-get

---
 Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4745247..c48c4ac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,8 +49,6 @@ RUN apt-get update && apt-get install -y \
   lua5.2 \
   make \
   mapnik-utils \
-  munin \
-  munin-node \
   nodejs \
   npm \
   postgis \

From 16b85cb9e2169e17a8400695362034c1ef09dc0f Mon Sep 17 00:00:00 2001
From: Grzegorz Adam Kowalski <grzegorz.adam.kowalski@outlook.com>
Date: Fri, 15 Mar 2019 16:50:46 +0100
Subject: [PATCH 10/21] latest postgres 10; multithread make

---
 Dockerfile | 62 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c48c4ac..dd88b9d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,9 @@ ENV TZ=UTC
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 # Install dependencies
-RUN apt-get update && apt-get install -y \
+RUN echo "deb [ allow-insecure=yes ] http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main" >> /etc/apt/sources.list.d/pgdg.list \
+  && apt-get update \
+  && apt-get install -y --no-install-recommends --allow-unauthenticated \
   apache2 \
   apache2-dev \
   autoconf \
@@ -18,14 +20,11 @@ RUN apt-get update && apt-get install -y \
   fonts-noto-cjk \
   fonts-noto-hinted \
   fonts-noto-unhinted \
-  g++ \
+  clang \
   gdal-bin \
   git-core \
   libagg-dev \
   libboost-all-dev \
-  libboost-dev \
-  libboost-filesystem-dev \
-  libboost-system-dev \
   libbz2-dev \
   libcairo-dev \
   libcairomm-1.0-dev \
@@ -36,8 +35,7 @@ RUN apt-get update && apt-get install -y \
   libgeos-dev \
   libgeotiff-epsg \
   libicu-dev \
-  liblua5.1-dev \
-  liblua5.2-dev \
+  liblua5.3-dev \
   libmapnik-dev \
   libpq-dev \
   libproj-dev \
@@ -45,16 +43,15 @@ RUN apt-get update && apt-get install -y \
   libtiff5-dev \
   libtool \
   libxml2-dev \
-  lua5.1 \
-  lua5.2 \
+  lua5.3 \
   make \
   mapnik-utils \
   nodejs \
   npm \
   postgis \
-  postgresql \
+  postgresql-10 \
   postgresql-10-postgis-2.4 \
-  postgresql-contrib \
+  postgresql-contrib-10 \
   protobuf-c-compiler \
   python-mapnik \
   sudo \
@@ -62,12 +59,17 @@ RUN apt-get update && apt-get install -y \
   ttf-unifont \
   unzip \
   wget \
-  zlib1g-dev
+  zlib1g-dev \
+&& apt-get clean autoclean \
+&& apt-get autoremove --yes \
+&& rm -rf /var/lib/{apt,dpkg,cache,log}/
 
 # Set up renderer user
 RUN adduser --disabled-password --gecos "" renderer
 USER renderer
 
+ENV GIT_SSL_NO_VERIFY=true
+
 # Install latest osm2pgsql
 RUN mkdir /home/renderer/src
 WORKDIR /home/renderer/src
@@ -75,8 +77,8 @@ 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 ..
-RUN make
+RUN cmake .. \
+  && make -j $(nproc)
 USER root
 RUN make install
 USER renderer
@@ -88,13 +90,13 @@ RUN python -c 'import mapnik'
 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
-RUN ./configure
-RUN make
+RUN ./autogen.sh \
+  && ./configure \
+  && make -j $(nproc)
 USER root
-RUN make install
-RUN make install-mod_tile
-RUN ldconfig
+RUN make -j $(nproc) install \
+  && make -j $(nproc) install-mod_tile \
+  && ldconfig
 USER renderer
 
 # Configure stylesheet
@@ -102,28 +104,30 @@ WORKDIR /home/renderer/src
 RUN git clone https://github.com/gravitystorm/openstreetmap-carto.git
 WORKDIR /home/renderer/src/openstreetmap-carto
 USER root
-RUN npm install -g carto
+RUN npm config set strict-ssl=false \
+  && npm install -g carto
 USER renderer
 RUN carto project.mml > mapnik.xml
 
 # Load shapefiles
 WORKDIR /home/renderer/src/openstreetmap-carto
+ENV PYTHONHTTPSVERIFY=0
 RUN scripts/get-shapefiles.py
 
 # Configure renderd
 USER root
-RUN sed -i 's/renderaccount/renderer/g' /usr/local/etc/renderd.conf
-RUN sed -i 's/hot/tile/g' /usr/local/etc/renderd.conf
+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
-RUN chown renderer /var/lib/mod_tile
-RUN mkdir /var/run/renderd
-RUN chown renderer /var/run/renderd
-RUN echo "LoadModule tile_module /usr/lib/apache2/modules/mod_tile.so" >> /etc/apache2/conf-available/mod_tile.conf
-RUN a2enconf mod_tile
+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 \
+  && a2enconf mod_tile
 COPY apache.conf /etc/apache2/sites-available/000-default.conf
 COPY leaflet-demo.html /var/www/html/index.html
 

From 48d257763ebb19383a69a7aa1faa9af07494e627 Mon Sep 17 00:00:00 2001
From: Grzegorz Adam Kowalski <grzegorz.adam.kowalski@outlook.com>
Date: Fri, 15 Mar 2019 17:33:07 +0100
Subject: [PATCH 11/21] redirect apache server logs to stdout & stderr

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index dd88b9d..34052f6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -130,6 +130,8 @@ RUN echo "LoadModule tile_module /usr/lib/apache2/modules/mod_tile.so" >> /etc/a
   && a2enconf mod_tile
 COPY apache.conf /etc/apache2/sites-available/000-default.conf
 COPY leaflet-demo.html /var/www/html/index.html
+RUN ln -sf /proc/1/fd/1 /var/log/apache2/access.log
+  && ln -sf /proc/1/fd/2 /var/log/apache2/error.log
 
 # Start running
 COPY run.sh /

From 1681d33635a41d99b2aa0651e640a88cea0b5109 Mon Sep 17 00:00:00 2001
From: Grzegorz Adam Kowalski <grzegorz.adam.kowalski@outlook.com>
Date: Fri, 15 Mar 2019 18:13:02 +0100
Subject: [PATCH 12/21] forgotten \

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 34052f6..0d385b4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -130,7 +130,7 @@ RUN echo "LoadModule tile_module /usr/lib/apache2/modules/mod_tile.so" >> /etc/a
   && a2enconf mod_tile
 COPY apache.conf /etc/apache2/sites-available/000-default.conf
 COPY leaflet-demo.html /var/www/html/index.html
-RUN ln -sf /proc/1/fd/1 /var/log/apache2/access.log
+RUN ln -sf /proc/1/fd/1 /var/log/apache2/access.log \
   && ln -sf /proc/1/fd/2 /var/log/apache2/error.log
 
 # Start running

From ad366e7c87b96a9fd1fca74eb46a6c8c4899a5e2 Mon Sep 17 00:00:00 2001
From: Grzegorz Adam Kowalski <grzegorz.adam.kowalski@outlook.com>
Date: Fri, 15 Mar 2019 18:33:40 +0100
Subject: [PATCH 13/21] Fix for wrong ownership of postgres data

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 0d385b4..d0c18ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -133,6 +133,9 @@ COPY leaflet-demo.html /var/www/html/index.html
 RUN ln -sf /proc/1/fd/1 /var/log/apache2/access.log \
   && ln -sf /proc/1/fd/2 /var/log/apache2/error.log
 
+# Configure PosgtreSQL
+RUN chown -R postgres:postgres /var/lib/postgresql
+
 # Start running
 COPY run.sh /
 ENTRYPOINT ["/run.sh"]

From ab0f62d08d3675d413a23fa1ea133221b9d91204 Mon Sep 17 00:00:00 2001
From: Grzegorz Adam Kowalski <grzegorz.adam.kowalski@outlook.com>
Date: Fri, 15 Mar 2019 19:20:59 +0100
Subject: [PATCH 14/21] Custom PostgreSQL conf with minimal settings

---
 Dockerfile             | 5 ++++-
 postgresql.custom.conf | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 postgresql.custom.conf

diff --git a/Dockerfile b/Dockerfile
index d0c18ca..9d020e6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -134,7 +134,10 @@ RUN ln -sf /proc/1/fd/1 /var/log/apache2/access.log \
   && ln -sf /proc/1/fd/2 /var/log/apache2/error.log
 
 # Configure PosgtreSQL
-RUN chown -R postgres:postgres /var/lib/postgresql
+COPY postgresql.custom.conf /etc/postgresql/10/main/
+RUN chown -R postgres:postgres /var/lib/postgresql \
+  && chown postgres:postgres /etc/postgresql/10/main/postgresql.custom.conf \
+  && echo "\ninclude 'postgresql.custom.conf'" >> /etc/postgresql/10/main/postgresql.conf
 
 # Start running
 COPY run.sh /
diff --git a/postgresql.custom.conf b/postgresql.custom.conf
new file mode 100644
index 0000000..8bf2399
--- /dev/null
+++ b/postgresql.custom.conf
@@ -0,0 +1,8 @@
+# Suggested minimal settings from
+# https://ircama.github.io/osm-carto-tutorials/tile-server-ubuntu/
+
+shared_buffers = 128MB
+min_wal_size = 1GB
+max_wal_size = 2GB
+work_mem = 32MB
+maintenance_work_mem = 256MB

From 6b1ef3fe223c57a1eb96ce0360edb46fb219c530 Mon Sep 17 00:00:00 2001
From: Grzegorz Adam Kowalski <grzegorz.adam.kowalski@outlook.com>
Date: Fri, 15 Mar 2019 19:29:40 +0100
Subject: [PATCH 15/21] Update postgresql.custom.conf

---
 postgresql.custom.conf | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/postgresql.custom.conf b/postgresql.custom.conf
index 8bf2399..07a530c 100644
--- a/postgresql.custom.conf
+++ b/postgresql.custom.conf
@@ -6,3 +6,19 @@ min_wal_size = 1GB
 max_wal_size = 2GB
 work_mem = 32MB
 maintenance_work_mem = 256MB
+
+# Suggested settings from
+# https://github.com/openstreetmap/chef/blob/master/roles/tile.rb#L38-L45
+
+max_connections = 250
+temp_buffers = 32MB
+work_mem = 128MB
+wal_buffers = 1024kB
+wal_writer_delay = 500ms
+commit_delay = 10000
+checkpoint_segments = 60
+max_wal_size = 2880MB
+random_page_cost = 1.1
+track_activity_query_size = 16384
+autovacuum_vacuum_scale_factor = 0.05
+autovacuum_analyze_scale_factor = 0.02

From 87a5ba06729f46553c021fef09099f2bbb62f211 Mon Sep 17 00:00:00 2001
From: Grzegorz Adam Kowalski <grzegorz.adam.kowalski@outlook.com>
Date: Fri, 15 Mar 2019 19:34:38 +0100
Subject: [PATCH 16/21] Update postgresql.custom.conf

---
 postgresql.custom.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/postgresql.custom.conf b/postgresql.custom.conf
index 07a530c..9d3e5ff 100644
--- a/postgresql.custom.conf
+++ b/postgresql.custom.conf
@@ -16,7 +16,7 @@ work_mem = 128MB
 wal_buffers = 1024kB
 wal_writer_delay = 500ms
 commit_delay = 10000
-checkpoint_segments = 60
+# checkpoint_segments = 60 # unrecognized in psql 10.7.1
 max_wal_size = 2880MB
 random_page_cost = 1.1
 track_activity_query_size = 16384

From ca32b809ead0173c88dfa4c8c3db9ca6390f5551 Mon Sep 17 00:00:00 2001
From: Grzegorz Adam Kowalski <grzegorz.adam.kowalski@outlook.com>
Date: Sat, 16 Mar 2019 22:14:41 +0100
Subject: [PATCH 17/21] fix for lost extension scripts

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9d020e6..51b205e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,7 +50,8 @@ RUN echo "deb [ allow-insecure=yes ] http://apt.postgresql.org/pub/repos/apt/ bi
   npm \
   postgis \
   postgresql-10 \
-  postgresql-10-postgis-2.4 \
+  postgresql-10-postgis-2.5 \
+  postgresql-10-postgis-2.5-scripts \
   postgresql-contrib-10 \
   protobuf-c-compiler \
   python-mapnik \

From 662ce85cb8b84ccb8f63a9160c366c864968817d Mon Sep 17 00:00:00 2001
From: Grzegorz Adam Kowalski <grzegorz.adam.kowalski@outlook.com>
Date: Sat, 16 Mar 2019 23:35:15 +0100
Subject: [PATCH 18/21] turn off autovacuum; fix psql errors

---
 run.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/run.sh b/run.sh
index 701d33e..5039751 100755
--- a/run.sh
+++ b/run.sh
@@ -12,11 +12,8 @@ fi
 
 if [ "$1" = "import" ]; then
     # Initialize PostgreSQL
+    sudo -u postgres echo "autovacuum = off" >> /etc/postgresql/10/main/postgresql.custom.conf
     service postgresql start
-    sudo -u postgres createuser renderer
-    sudo -u postgres createdb -E UTF8 -O renderer gis
-    sudo -u postgres psql -d gis -c "CREATE EXTENSION postgis;"
-    sudo -u postgres psql -d gis -c "CREATE EXTENSION hstore;"
     sudo -u postgres psql -d gis -c "ALTER TABLE geometry_columns OWNER TO renderer;"
     sudo -u postgres psql -d gis -c "ALTER TABLE spatial_ref_sys OWNER TO renderer;"
 

From 42b5783486ed1de2607f80955e768c511fcdaaf7 Mon Sep 17 00:00:00 2001
From: Grzegorz Adam Kowalski <grzegorz.adam.kowalski@outlook.com>
Date: Sun, 17 Mar 2019 01:01:52 +0100
Subject: [PATCH 19/21] revert changes

---
 run.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/run.sh b/run.sh
index 5039751..97e2dbe 100755
--- a/run.sh
+++ b/run.sh
@@ -14,6 +14,10 @@ if [ "$1" = "import" ]; then
     # Initialize PostgreSQL
     sudo -u postgres echo "autovacuum = off" >> /etc/postgresql/10/main/postgresql.custom.conf
     service postgresql start
+    sudo -u postgres createuser renderer
+    sudo -u postgres createdb -E UTF8 -O renderer gis
+    sudo -u postgres psql -d gis -c "CREATE EXTENSION postgis;"
+    sudo -u postgres psql -d gis -c "CREATE EXTENSION hstore;"
     sudo -u postgres psql -d gis -c "ALTER TABLE geometry_columns OWNER TO renderer;"
     sudo -u postgres psql -d gis -c "ALTER TABLE spatial_ref_sys OWNER TO renderer;"
 

From c8f8d0fd71c686bd34b076715b27fcc8f48bad0e Mon Sep 17 00:00:00 2001
From: Grzegorz Adam Kowalski <grzegorz.adam.kowalski@outlook.com>
Date: Sun, 17 Mar 2019 20:33:06 +0100
Subject: [PATCH 20/21] verify SSL

---
 Dockerfile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 51b205e..87f0229 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,7 @@ 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 \
   && apt-get update \
+  && apt-get install -y apt-transport-https ca-certificates \
   && apt-get install -y --no-install-recommends --allow-unauthenticated \
   apache2 \
   apache2-dev \
@@ -69,8 +70,6 @@ RUN echo "deb [ allow-insecure=yes ] http://apt.postgresql.org/pub/repos/apt/ bi
 RUN adduser --disabled-password --gecos "" renderer
 USER renderer
 
-ENV GIT_SSL_NO_VERIFY=true
-
 # Install latest osm2pgsql
 RUN mkdir /home/renderer/src
 WORKDIR /home/renderer/src
@@ -105,14 +104,12 @@ WORKDIR /home/renderer/src
 RUN git clone https://github.com/gravitystorm/openstreetmap-carto.git
 WORKDIR /home/renderer/src/openstreetmap-carto
 USER root
-RUN npm config set strict-ssl=false \
-  && npm install -g carto
+RUN npm install -g carto
 USER renderer
 RUN carto project.mml > mapnik.xml
 
 # Load shapefiles
 WORKDIR /home/renderer/src/openstreetmap-carto
-ENV PYTHONHTTPSVERIFY=0
 RUN scripts/get-shapefiles.py
 
 # Configure renderd

From c99368d160934465ffb423db396eadefd04c7cba Mon Sep 17 00:00:00 2001
From: Grzegorz Adam Kowalski <grzegorz.adam.kowalski@outlook.com>
Date: Tue, 19 Mar 2019 16:47:57 +0100
Subject: [PATCH 21/21] Info about shared memory error

issue #3
---
 README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/README.md b/README.md
index 97618f2..1f7e583 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,21 @@ 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 -d overv/openstreetmap-tile-server run
 
+## Troubleshooting
+
+### ERROR: could not resize shared memory segment
+
+If you encounter such entries in the log, it will mean that the default shared memory limit (64 MB) is too low for the container and it should be raised:
+
+    renderd[126]: ERROR: failed to render TILE ajt 6 32-39 16-23,
+    renderd[126]: reason: Postgis Plugin: ERROR: could not resize shared memory segment
+
+To raise it use `--shm-size` parameter. For example:
+
+    docker run -p 80:80 -v openstreetmap-data:/var/lib/postgresql/10/main --shm-size="192m" -d overv/openstreetmap-tile-server run
+
+For too high values you may notice excessive CPU load and memory usage. It might be that you will have to experimentally find the best values for yourself.
+
 ## License
 
 ```