X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/cacc8d9a0763d6581e76b55973c47b2b5820fd2b..9241d9810d39607acaef19bed6f69d8f3dd38220:/Dockerfile diff --git a/Dockerfile b/Dockerfile index 40ad730cd..0bd5947be 100644 --- 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 --ignore-engines install +ADD bin/yarn /app/bin/ +RUN bundle exec bin/yarn install