diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-01-02 13:45:18 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-02 15:36:53 +0100 |
| commit | 571d219bb917cefcca7419a0ad4e3889689d5f6a (patch) | |
| tree | 6ab91adcb2c164fd027708e58f5fb96c52474007 /Dockerfile | |
| parent | b300948526d967aaf5608c93546ee0d54940c0ef (diff) | |
| parent | 66436d08959998be20c6c6bf631177d8c1f3e0d1 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock
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 |