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 78be28838980e2d561641071d48659fd2ac40ddd..02d9ff170e19a05216fa1bd1c03ee61aa8b707b6 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,8 +20,9 @@ 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 \


@@ -49,8 +50,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/

diff --git a/INSTALL.md b/INSTALL.md
index 99db9c037bf71d777d4a8c7fcb90d21d3cf06b3c..74c736f4c735d6d29d9693d3a7f15819e0966d1b 100644 (file)
--- 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 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
                      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
 ```
 
 sudo npm install --global yarn
 ```
 

diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh
index af183a5ffdbb9e0a8bcad2be79b8f3e7286082f3..8fb296ae6ea303461e2ca38827184522c6f21e0f 100644 (file)
--- 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 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
                      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
 npm install --global yarn
 
 ## install the bundle necessary for openstreetmap-website