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

[rails.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 78be28838980e2d561641071d48659fd2ac40ddd..f3c56e1615c922c53a91dd5aaae86ea9a51c0d64 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,16 +20,16 @@ RUN apt-get update \
       libxslt1-dev \
       locales \
       postgresql-client \
       libxslt1-dev \
       locales \
       postgresql-client \

-      ruby3.0 \
-      ruby3.0-dev \
+      ruby \
+      ruby-dev \
+      ruby-bundler \

       software-properties-common \
       tzdata \
       unzip \
       software-properties-common \
       tzdata \
       unzip \

- && curl https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
- && add-apt-repository -y -U https://deb.nodesource.com/node_18.x \
- && apt-get install --no-install-recommends -y \

       nodejs \
       nodejs \

+      npm \

  && npm install --global yarn \
  && npm install --global yarn \

+ # We can't use snap packages for firefox inside a container, so we need to get firefox+geckodriver elsewhere

  && add-apt-repository -y ppa:mozillateam/ppa \
  && echo "Package: *\nPin: release o=LP-PPA-mozillateam\nPin-Priority: 1001" > /etc/apt/preferences.d/mozilla-firefox \
  && apt-get install --no-install-recommends -y \
  && add-apt-repository -y ppa:mozillateam/ppa \
  && echo "Package: *\nPin: release o=LP-PPA-mozillateam\nPin-Priority: 1001" > /etc/apt/preferences.d/mozilla-firefox \
  && apt-get install --no-install-recommends -y \


@@ -49,8 +49,7 @@ WORKDIR /app
 
 # Install Ruby packages
 ADD Gemfile Gemfile.lock /app/
 
 # Install Ruby packages
 ADD Gemfile Gemfile.lock /app/

-RUN gem install bundler \
- && bundle install
+RUN bundle install

 
 # Install NodeJS packages using yarn
 ADD package.json yarn.lock /app/
 
 # Install NodeJS packages using yarn
 ADD package.json yarn.lock /app/