]> cat aescling's git repositories - mastodon.git/commitdiff
Installing libxml2 and libxslt on Docker (#9680)
authorYamagishi Kazutoshi <ykzts@desire.sh>
Tue, 1 Jan 2019 03:03:54 +0000 (12:03 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Tue, 1 Jan 2019 03:03:54 +0000 (04:03 +0100)
Dockerfile

index 11fc17d36575c77d0b27caf7c8342ac811d20165..6ced074550790f898a43379c005b5ace8583398c 100644 (file)
@@ -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