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.
This commit is contained in:
parent
75e3227508
commit
d6d16dedb9
3 changed files with 6 additions and 8 deletions
|
@ -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/
|
||||
|
|
|
@ -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
|
||||
```
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue