Update Dockerfile

Dockerfile

@@ -69,6 +69,8 @@ RUN cd ~ \
  && 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 update \
 && apt-get install -y --no-install-recommends \
@@ -82,6 +84,16 @@ RUN cd ~ \
 
 ###########################################################################################################
 
+FROM compiler-common AS compiler-helper-script
+RUN 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
@@ -100,7 +112,6 @@ RUN apt-get update \
   fonts-noto-hinted \
   fonts-noto-unhinted \
   gdal-bin \
-  git-core \
   liblua5.3-dev \
   lua5.3 \
   mapnik-utils \
@@ -150,14 +161,6 @@ RUN chmod +x /usr/bin/openstreetmap-tiles-update-expire \
  && 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
-RUN 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
-
 RUN mkdir /nodes \
  && chown renderer:renderer /nodes
 
@@ -185,7 +188,10 @@ RUN dpkg -i 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
+  && 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 .
@@ -196,10 +202,8 @@ RUN dpkg -i mod-tile_1-1_amd64.deb \
 # Install stylesheet
 COPY --from=compiler-stylesheet /root/openstreetmap-carto /home/renderer/src/openstreetmap-carto
 
-# Configure renderd
+# Install helper script
-RUN sed -i 's/renderaccount/renderer/g' /usr/local/etc/renderd.conf \
+COPY --from=compiler-helper-script /home/renderer/src/regional /home/renderer/src/regional
- && sed -i 's/\/truetype//g' /usr/local/etc/renderd.conf \
- && sed -i 's/hot/tile/g' /usr/local/etc/renderd.conf
 
 # Start running
 COPY run.sh /