Browse Source

upgrade and patch docker image

cofe
sn0w 4 months ago
parent
commit
2319ed9298
Signed by: sn0w <sn0w@posteo.de> GPG Key ID: DDEDFB9D3FA15727
1 changed files with 9 additions and 5 deletions
  1. 9
    5
      Dockerfile

+ 9
- 5
Dockerfile View File

@@ -1,5 +1,5 @@
FROM node:8.14.0-alpine as node
FROM ruby:2.4.5-alpine3.8
FROM node:10-alpine as node
FROM ruby:2.5-alpine

LABEL maintainer="https://github.com/tootsuite/mastodon" \
description="Your self-hosted, globally interconnected microblogging community"
@@ -25,15 +25,19 @@ COPY --from=node /usr/local/bin/npm /usr/local/bin/npm
COPY --from=node /opt/yarn-* /opt/yarn

RUN apk -U upgrade \
&& apk add -t build-dependencies \
build-base \
&& apk add -t \
build-dependencies \
alpine-sdk \
icu-dev \
libidn-dev \
libressl \
libtool \
libxml2 \
libxslt \
postgresql-dev \
protobuf-dev \
python \
gmp-dev \
&& apk add \
ca-certificates \
ffmpeg \
@@ -70,7 +74,7 @@ USER mastodon

COPY --chown=mastodon:mastodon Gemfile Gemfile.lock package.json yarn.lock .yarnclean /mastodon/

RUN bundle config build.nokogiri --with-iconv-lib=/usr/local/lib --with-iconv-include=/usr/local/include \
RUN bundle config build.nokogiri --use-system-libraries --with-iconv-lib=/usr/local/lib --with-iconv-include=/usr/local/include \
&& bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --without test development \
&& yarn install --pure-lockfile --ignore-engines \
&& yarn cache clean

Loading…
Cancel
Save