From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 31 May 2023 15:22:30 +0000 (+0100)
Subject: Simplify ruby installations
X-Git-Tag: live~798^2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d6d16dedb917d1e0339eced418de8ae908dba3e8?hp=75e3227508b3823d0d3a56f17cda63a4a047be5b

Simplify ruby installations

Refs #4048

* We don't currently need a specific version suffix on the package names,
  since ubuntu only ships with one ruby version (and newer versions on
  e.g. 23.04 are fine).
* We don't need to explicitly install libruby, since it's pulled in by
  other packages as required.
* Ubuntu again ships a decent enough version of bundler for our needs,
  so we don't need to install it via rubygems.
---

diff --git a/Dockerfile b/Dockerfile
index 78be28838..02d9ff170 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 \
@@ -49,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/
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 af183a5ff..8fb296ae6 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