about summary refs log tree commit diff
path: root/Dockerfile
diff options
context:
space:
mode:
authorYamagishi Kazutoshi <ykzts@desire.sh>2019-01-01 12:03:54 +0900
committerEugen Rochko <eugen@zeonfederated.com>2019-01-01 04:03:54 +0100
commitea03faa167ba332b26ee26730e0d5466ca262ab2 (patch)
tree4266e1c593e9b7cde6322ed4a846984f0d9902f2 /Dockerfile
parente3dc8870bf3ec2e143dfe5be258ccba608f0e85f (diff)
Installing libxml2 and libxslt on Docker (#9680)
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index 11fc17d36..6ced07455 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,6 +31,8 @@ RUN apk -U upgrade \
     libidn-dev \
     libressl \
     libtool \
+    libxml2-dev \
+    libxslt-dev \
     postgresql-dev \
     protobuf-dev \
     python \
@@ -43,6 +45,8 @@ RUN apk -U upgrade \
     imagemagick \
     libidn \
     libpq \
+    libxml2 \
+    libxslt \
     protobuf \
     tini \
     tzdata \
@@ -64,7 +68,7 @@ RUN apk -U upgrade \
 
 COPY 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