Skip to content

Commit cab8a6a

Browse files
Upgrade to Ruby 4.0.5 (#1338)
1 parent 84c2894 commit cab8a6a

4 files changed

Lines changed: 9 additions & 11 deletions

File tree

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby-4.0.3
1+
ruby-4.0.5

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# For a containerized dev environment, see Dev Containers: https://guides.rubyonrails.org/getting_started_with_devcontainer.html
99

1010
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version
11-
ARG RUBY_VERSION=4.0.3
11+
ARG RUBY_VERSION=4.0.5
1212
FROM docker.io/library/ruby:$RUBY_VERSION-slim AS base
1313

1414
# Rails app lives here

Dockerfile.dev

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:4.0.3
1+
FROM ruby:4.0.5
22

33
# Install system dependencies including Node.js
44
RUN apt-get update -qq && \
@@ -49,13 +49,11 @@ RUN bundle install
4949
# with "Source locally installed gems is ignoring..." warnings.
5050
RUN gem pristine --extensions json erb bigdecimal rdoc
5151

52-
# The ruby:4.0.3 base image ships rdoc 7.0.3 in the system gem path with a
53-
# rubygems plugin that auto-loads it on every gem/bundler invocation. The
54-
# Gemfile resolves to rdoc 7.2.0 (also auto-loaded via its own plugin), so
55-
# both versions get required and we get "already initialized constant"
56-
# warnings on every command. Removing the system copy leaves only the
57-
# bundled rdoc 7.2.0 to be loaded.
58-
RUN gem uninstall -i /usr/local/lib/ruby/gems/4.0.0 -I -x rdoc -v 7.0.3 || true
52+
# The base image can ship rdoc in the default gem path with a rubygems plugin
53+
# that auto-loads on every gem/bundler invocation. The Gemfile also resolves
54+
# rdoc, so both copies can be required and emit "already initialized constant"
55+
# warnings. Removing the default-path copy leaves only the bundled rdoc.
56+
RUN gem uninstall -i "$(ruby -e 'print Gem.default_dir')" -I -x rdoc --all || true
5957

6058
# Add a script to be executed every time the container starts
6159
COPY entrypoint.dev.sh /usr/bin/

Dockerfile.production-worker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# docker run -d -e RAILS_MASTER_KEY=<value from config/master.key> --name harbor-worker harbor-worker
77

88
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version
9-
ARG RUBY_VERSION=4.0.3
9+
ARG RUBY_VERSION=4.0.5
1010
FROM docker.io/library/ruby:$RUBY_VERSION-slim AS base
1111

1212
# Rails app lives here

0 commit comments

Comments
 (0)