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

[rails.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 40ad730cd77f0e9b6c14706e77e568fe15212a3e..7d5d4982cd3d3d3d228f31d6141bc4751a15b8ef 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 \


@@ -46,6 +45,6 @@ RUN gem install bundler \
  && bundle install
 
 # Install NodeJS packages using yarnpkg
  && bundle install
 
 # Install NodeJS packages using yarnpkg

-# `bundle exec rake yarn:install` will not work
+# `bundle exec rails yarn:install` will not work

 ADD package.json yarn.lock /app/
 RUN yarnpkg --ignore-engines install
 ADD package.json yarn.lock /app/
 RUN yarnpkg --ignore-engines install