Skip to content

Commit

Permalink
🔨 Updated user command
Browse files Browse the repository at this point in the history
  • Loading branch information
Gjacquenot committed Dec 23, 2019
1 parent f9f1047 commit 62a9727
Showing 1 changed file with 5 additions and 20 deletions.
25 changes: 5 additions & 20 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ RUN wget http://download.osgeo.org/postgis/source/postgis-3.0.0rc2.tar.gz -O pos

# Set up renderer user
RUN adduser --disabled-password --gecos "" renderer
USER renderer

# Install latest osm2pgsql
RUN mkdir -p /home/renderer/src \
Expand All @@ -103,10 +102,6 @@ RUN mkdir -p /home/renderer/src \
&& mkdir /nodes \
&& chown renderer:renderer /nodes \
&& rm -rf /home/renderer/src
USER renderer

# Install and test Mapnik
RUN python -c 'import mapnik'

# Install mod_tile and renderd
RUN mkdir -p /home/renderer/src \
Expand All @@ -120,29 +115,21 @@ RUN mkdir -p /home/renderer/src \
&& ldconfig \
&& cd .. \
&& rm -rf mod_tile
USER renderer

# Configure stylesheet
RUN mkdir -p /home/renderer/src \
&& git clone https://github.com/gravitystorm/openstreetmap-carto.git \
&& git -C openstreetmap-carto checkout v4.23.0 \
&& openstreetmap-carto \
&& npm install -g [email protected]
USER renderer
RUN carto project.mml > mapnik.xml

# Load shapefiles
WORKDIR /home/renderer/src/openstreetmap-carto
RUN scripts/get-shapefiles.py
&& cd openstreetmap-carto \
&& npm install -g [email protected] \
&& carto project.mml > mapnik.xml \
&& 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
&& 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 \
Expand Down Expand Up @@ -171,15 +158,13 @@ RUN chmod +x /usr/bin/openstreetmap-tiles-update-expire \
&& 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

# Start running
USER root
COPY run.sh /
COPY indexes.sql /
ENTRYPOINT ["/run.sh"]
Expand Down

0 comments on commit 62a9727

Please sign in to comment.