Merge pull request #3846 from SK53/osgb-date-2022

[rails.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index e8ff013870493ccee62d27b8730a8f5102707e18..0bd5947be5ceb1fb2cb4dc2c425f5b3e1175a6b7 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,13 +10,12 @@ RUN apt-get update \
       default-jre-headless \
       file \
       firefox-geckodriver \
-      imagemagick \
       libarchive-dev \
       libffi-dev \
       libgd-dev \
-      libmagickwand-dev \
       libpq-dev \
       libsasl2-dev \
+      libvips-dev \
       libxml2-dev \
       libxslt1-dev \
       locales \
@@ -45,7 +44,7 @@ ADD Gemfile Gemfile.lock /app/
 RUN gem install bundler \
  && bundle install
 
-# Install NodeJS packages using yarnpkg
-# `bundle exec rake yarn:install` will not work
+# Install NodeJS packages using yarn
 ADD package.json yarn.lock /app/
-RUN yarnpkg install
+ADD bin/yarn /app/bin/
+RUN bundle exec bin/yarn install