Update node.js and imagemagick (#1951)

* update Dockerfile: latest nodejs LTS

* also update imagemagick
This commit is contained in:
Wonderfall 2017-04-16 20:28:25 +02:00 committed by Eugen
parent f87b51fda8
commit 0cbcc5e297
1 changed files with 5 additions and 3 deletions

View File

@ -12,20 +12,22 @@ WORKDIR /mastodon
COPY Gemfile Gemfile.lock package.json yarn.lock /mastodon/ COPY Gemfile Gemfile.lock package.json yarn.lock /mastodon/
RUN BUILD_DEPS=" \ RUN echo "@edge https://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories \
&& BUILD_DEPS=" \
postgresql-dev \ postgresql-dev \
libxml2-dev \ libxml2-dev \
libxslt-dev \ libxslt-dev \
build-base" \ build-base" \
&& apk -U upgrade && apk add \ && apk -U upgrade && apk add \
$BUILD_DEPS \ $BUILD_DEPS \
nodejs \ nodejs@edge \
nodejs-npm@edge \
libpq \ libpq \
libxml2 \ libxml2 \
libxslt \ libxslt \
ffmpeg \ ffmpeg \
file \ file \
imagemagick \ imagemagick@edge \
&& npm install -g npm@3 && npm install -g yarn \ && npm install -g npm@3 && npm install -g yarn \
&& bundle install --deployment --without test development \ && bundle install --deployment --without test development \
&& yarn --ignore-optional \ && yarn --ignore-optional \