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

[rails.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 7d5d4982cd3d3d3d228f31d6141bc4751a15b8ef..0bd5947be5ceb1fb2cb4dc2c425f5b3e1175a6b7 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,7 +44,7 @@ ADD Gemfile Gemfile.lock /app/
 RUN gem install bundler \
  && bundle install
 
 RUN gem install bundler \
  && bundle install
 

-# Install NodeJS packages using yarnpkg
-# `bundle exec rails yarn:install` will not work
+# Install NodeJS packages using yarn

 ADD package.json yarn.lock /app/
 ADD package.json yarn.lock /app/

-RUN yarnpkg --ignore-engines install
+ADD bin/yarn /app/bin/
+RUN bundle exec bin/yarn install