diff options
author | Wonderfall <wonderfall@targaryen.house> | 2017-04-16 20:28:25 +0200 |
---|---|---|
committer | Eugen <eugen@zeonfederated.com> | 2017-04-16 20:28:25 +0200 |
commit | 0cbcc5e297acc51688fa618d3d4a5882629cdcb3 (patch) | |
tree | 5d297ff7777e86d64188c3093e3be81d9ce1f81e /Dockerfile | |
parent | f87b51fda899a07c064c27de74bd56b974b5e3a5 (diff) |
Update node.js and imagemagick (#1951)
* update Dockerfile: latest nodejs LTS * also update imagemagick
Diffstat (limited to 'Dockerfile')
-rw-r--r-- | Dockerfile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile index dc1ebb06d..9d018a93b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,20 +12,22 @@ WORKDIR /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 \ libxml2-dev \ libxslt-dev \ build-base" \ && apk -U upgrade && apk add \ $BUILD_DEPS \ - nodejs \ + nodejs@edge \ + nodejs-npm@edge \ libpq \ libxml2 \ libxslt \ ffmpeg \ file \ - imagemagick \ + imagemagick@edge \ && npm install -g npm@3 && npm install -g yarn \ && bundle install --deployment --without test development \ && yarn --ignore-optional \ |