From 0cbcc5e297acc51688fa618d3d4a5882629cdcb3 Mon Sep 17 00:00:00 2001 From: Wonderfall Date: Sun, 16 Apr 2017 20:28:25 +0200 Subject: [PATCH] Update node.js and imagemagick (#1951) * update Dockerfile: latest nodejs LTS * also update imagemagick --- Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index dc1ebb06ddd..9d018a93b0f 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 \