Merge remote-tracking branch 'upstream/pull/3821'

[rails.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index e8ff013870493ccee62d27b8730a8f5102707e18..aae65c2bb9765dcc7b1ee8900fa53d56107a5ae6 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,13 +10,12 @@ RUN apt-get update \
       default-jre-headless \
       file \
       firefox-geckodriver \
       default-jre-headless \
       file \
       firefox-geckodriver \

-      imagemagick \

       libarchive-dev \
       libffi-dev \
       libgd-dev \
       libarchive-dev \
       libffi-dev \
       libgd-dev \

-      libmagickwand-dev \

       libpq-dev \
       libsasl2-dev \
       libpq-dev \
       libsasl2-dev \

+      libvips-dev \

       libxml2-dev \
       libxslt1-dev \
       locales \
       libxml2-dev \
       libxslt1-dev \
       locales \


@@ -48,4 +47,4 @@ RUN gem install bundler \
 # Install NodeJS packages using yarnpkg
 # `bundle exec rake yarn:install` will not work
 ADD package.json yarn.lock /app/
 # Install NodeJS packages using yarnpkg
 # `bundle exec rake yarn:install` will not work
 ADD package.json yarn.lock /app/

-RUN yarnpkg install
+RUN yarnpkg --ignore-engines install