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

[rails.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index c85a6404606d99bd8ef4a416f6eed2a7c6319881..446f71ac32e8d25702a89c00d3af931400a2728b 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,7 @@ RUN apt-get update \
       curl \
       default-jre-headless \
       file \
+      git-core \
       gpg-agent \
       libarchive-dev \
       libffi-dev \
@@ -20,8 +21,9 @@ RUN apt-get update \
       libxslt1-dev \
       locales \
       postgresql-client \
-      ruby3.0 \
-      ruby3.0-dev \
+      ruby \
+      ruby-dev \
+      ruby-bundler \
       software-properties-common \
       tzdata \
       unzip \
@@ -48,8 +50,7 @@ WORKDIR /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/