Merge pull request #101 from pandel/master
Get nodejs from source because of apt package conflict
This commit is contained in:
commit
0bb62b77d3
12
Dockerfile
12
Dockerfile
@ -15,8 +15,13 @@ RUN apt-get update \
|
||||
&& 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 \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y apt-transport-https ca-certificates \
|
||||
&& apt-get install -y --no-install-recommends --allow-unauthenticated \
|
||||
&& apt-get install -y apt-transport-https ca-certificates
|
||||
|
||||
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-dev \
|
||||
autoconf \
|
||||
@ -54,8 +59,7 @@ RUN apt-get update \
|
||||
lua5.3 \
|
||||
make \
|
||||
mapnik-utils \
|
||||
nodejs \
|
||||
npm \
|
||||
node-gyp \
|
||||
osmium-tool \
|
||||
osmosis \
|
||||
postgis \
|
||||
|
Loading…
Reference in New Issue
Block a user