diff options
| author | ThibG <thib@sitedethib.com> | 2019-01-02 20:03:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-02 20:03:32 +0100 |
| commit | 0acd51acdc1e670bf57f58671cb8e30743782c63 (patch) | |
| tree | f5ff0b5c3b1e8fd94691264f2bc147e5fa233ecb /Dockerfile | |
| parent | b300948526d967aaf5608c93546ee0d54940c0ef (diff) | |
| parent | e77ceb1b29547ed89b4110b3cc3edc9ac325b620 (diff) | |
Merge pull request #878 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile index 826e237c4..28cb5260e 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 \ @@ -67,7 +71,7 @@ COPY stack-fix.c /lib RUN gcc -shared -fPIC /lib/stack-fix.c -o /lib/stack-fix.so RUN rm /lib/stack-fix.c -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 |