From ea03faa167ba332b26ee26730e0d5466ca262ab2 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Tue, 1 Jan 2019 12:03:54 +0900
Subject: [PATCH] Installing libxml2 and libxslt on Docker (#9680)
---
Dockerfile | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 11fc17d365..6ced074550 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
--
GitLab