From 8bac516eb14d6c5045cd32f5f7c0e9fef570b23f Mon Sep 17 00:00:00 2001
From: Guillaume Jacquenot <guillaume.jacquenot@gmail.com>
Date: Sat, 21 Dec 2019 22:25:04 +0100
Subject: [PATCH] :hammer: Refactored osm2pgsql install

---
 Dockerfile | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a8cf91a..27e184b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -91,18 +91,18 @@ 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
+RUN mkdir -p /home/renderer/src \
+ && cd /home/renderer/src \
+ && git clone https://github.com/openstreetmap/osm2pgsql.git \
+ && cd /home/renderer/src/osm2pgsql \
+ && mkdir build \
+ && cd build \
+ && cmake .. \
+ && make -j $(nproc) \
+ && make install \
+ && mkdir /nodes \
+ && chown renderer:renderer /nodes \
+ && rm -rf /home/renderer/src
 USER renderer
 
 # Install and test Mapnik