From: Tom Hughes <tom@compton.nu>
Date: Wed, 31 May 2023 17:38:10 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4053'
X-Git-Tag: live~1769
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d238a90244f6706dacbb18576243a4c1f650c080?hp=e9de1537f924c0ceb9c42086da5a54abba268126

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

diff --git a/Dockerfile b/Dockerfile
index c85a64046..f3c56e161 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,8 +20,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 +49,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/
diff --git a/INSTALL.md b/INSTALL.md
index 99db9c037..74c736f4c 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -31,12 +31,11 @@ These can be installed on Ubuntu 22.04 or later with:
 
 ```
 sudo apt-get update
-sudo apt-get install ruby3.0 libruby3.0 ruby3.0-dev \
+sudo apt-get install ruby ruby-dev ruby-bundler \
                      libvips-dev libxml2-dev libxslt1-dev nodejs \
                      build-essential git-core \
                      postgresql postgresql-contrib libpq-dev libsasl2-dev \
                      libffi-dev libgd-dev libarchive-dev libbz2-dev npm
-sudo gem3.0 install bundler
 sudo npm install --global yarn
 ```
 
diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh
index d48fb9d0b..d34c46008 100644
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@ -16,12 +16,11 @@ apt-get update
 apt-get upgrade -y
 
 # install packages as explained in INSTALL.md
-apt-get install -y ruby3.0 libruby3.0 ruby3.0-dev \
+apt-get install -y ruby ruby-dev ruby-bundler \
                      libxml2-dev libxslt1-dev nodejs npm \
                      build-essential git-core \
                      postgresql postgresql-contrib libpq-dev libvips-dev \
                      libsasl2-dev libffi-dev libgd-dev libarchive-dev libbz2-dev
-gem3.0 install --version "~> 2.1.4" bundler
 npm install --global yarn
 
 ## install the bundle necessary for openstreetmap-website