champs-libres/openstreetmap-tile-server
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #101 from pandel/master

Browse Source 
Get nodejs from source because of apt package conflict
This commit is contained in:
Alexander Overvoorde 2020-02-10 22:09:50 +01:00 committed by GitHub
commit 0bb62b77d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile
View File

@ -15,8 +15,13 @@ RUN apt-get update \
&& wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
&& echo "deb [ trusted=yes ] http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list \ && echo "deb [ trusted=yes ] http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list \
&& apt-get update \ && apt-get update \
&& apt-get install -y apt-transport-https ca-certificates \ && apt-get install -y apt-transport-https ca-certificates
&& apt-get install -y --no-install-recommends --allow-unauthenticated \
RUN apt-get install -y curl \
&& wget --quiet -O - https://deb.nodesource.com/setup_10.x | bash - \
&& apt-get install -y nodejs
RUN apt-get install -y --no-install-recommends --allow-unauthenticated \
apache2 \ apache2 \
apache2-dev \ apache2-dev \
autoconf \ autoconf \
@ -54,8 +59,7 @@ RUN apt-get update \
lua5.3 \ lua5.3 \
make \ make \
mapnik-utils \ mapnik-utils \
nodejs \ node-gyp \
npm \
osmium-tool \ osmium-tool \
osmosis \ osmosis \
postgis \ postgis \