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

[rails.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index e8ff013870493ccee62d27b8730a8f5102707e18..37d6edda5333506b3e3a65457d4f71cc3370a6fd 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -9,21 +9,19 @@ RUN apt-get update \
       curl \
       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 \
       nodejs \
       postgresql-client \
-      ruby2.7 \
-      ruby2.7-dev \
+      ruby3.0 \
+      ruby3.0-dev \
       tzdata \
       unzip \
       yarnpkg \
@@ -45,7 +43,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