Browse Source

upgrade and patch docker image

cofe
sn0w 2 weeks 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 @@
1
-FROM node:8.14.0-alpine as node
2
-FROM ruby:2.4.5-alpine3.8
1
+FROM node:10-alpine as node
2
+FROM ruby:2.5-alpine
3 3
 
4 4
 LABEL maintainer="https://github.com/tootsuite/mastodon" \
5 5
       description="Your self-hosted, globally interconnected microblogging community"
@@ -25,15 +25,19 @@ COPY --from=node /usr/local/bin/npm /usr/local/bin/npm
25 25
 COPY --from=node /opt/yarn-* /opt/yarn
26 26
 
27 27
 RUN apk -U upgrade \
28
- && apk add -t build-dependencies \
29
-    build-base \
28
+ && apk add -t \
29
+    build-dependencies \
30
+    alpine-sdk \
30 31
     icu-dev \
31 32
     libidn-dev \
32 33
     libressl \
33 34
     libtool \
35
+    libxml2 \
36
+    libxslt \
34 37
     postgresql-dev \
35 38
     protobuf-dev \
36 39
     python \
40
+    gmp-dev \
37 41
  && apk add \
38 42
     ca-certificates \
39 43
     ffmpeg \
@@ -70,7 +74,7 @@ USER mastodon
70 74
 
71 75
 COPY --chown=mastodon:mastodon Gemfile Gemfile.lock package.json yarn.lock .yarnclean /mastodon/
72 76
 
73
-RUN bundle config build.nokogiri --with-iconv-lib=/usr/local/lib --with-iconv-include=/usr/local/include \
77
+RUN bundle config build.nokogiri --use-system-libraries --with-iconv-lib=/usr/local/lib --with-iconv-include=/usr/local/include \
74 78
  && bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --without test development \
75 79
  && yarn install --pure-lockfile --ignore-engines \
76 80
  && yarn cache clean

Loading…
Cancel
Save