Skip to content

Commit

Permalink
bump rubies:
Browse files Browse the repository at this point in the history
- 3.4.0 → 3.4.1
- 3.3.5 → 3.3.5 [^1]
- 3.2.0 → 3.2.6
- 3.1.0 → 3.1.2 [^2]
- 3.0.0 → 3.0.7
- 2.7.0 → 2.7.8
- 2.6.0 → 2.6.10
- 2.5.0 → 2.5.9
- 2.4.0 → 2.4.10

And update the default rbenv from 3.1.3 to 3.1.6.

[^1]: unchanged
[^2]: not the latest 3.1.6 because ruby/ruby#6193 broke
      cross-compilation builds until it was fixed in 3.2.0.rc2 by
      ruby/ruby#6944 and ruby/ruby#6959 which weren't backported
      (see https://bugs.ruby-lang.org/issues/19239)
  • Loading branch information
flavorjones committed Dec 28, 2024
1 parent cc37afb commit 5eff8e1
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions Dockerfile.mri.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN apt-get -y update && \
##
RUN groupadd -r rubyuser && useradd -r -g rubyuser -G sudo -p "" --create-home rubyuser

ENV RBENV_ROOT=/usr/local/rbenv RBENV_RUBIES="2.5.9 3.1.3"
ENV RBENV_ROOT=/usr/local/rbenv RBENV_RUBIES="2.5.9 3.1.6"

# chown after running `rbenv init` because that command creates some subdirectories
RUN git clone https://github.com/rbenv/rbenv.git ${RBENV_ROOT} && \
Expand Down Expand Up @@ -109,19 +109,19 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
#
xrubies_build_plan = if platform =~ /x64-mingw-ucrt/
[
# Rubyinstaller-3.1.0+ is platform x64-mingw-ucrt
["3.4.0:3.3.5:3.2.0:3.1.0", "3.1.3"],
# Rubyinstaller-3.1+ is platform x64-mingw-ucrt
["3.4.1:3.3.5:3.2.6:3.1.2", "3.1.6"],
]
elsif platform =~ /x64-mingw32/
[
# Rubyinstaller prior to 3.1.0 is platform x64-mingw32
["2.6.0:2.5.0:2.4.0", "2.5.9"],
["3.0.0:2.7.0", "3.1.3"],
# Rubyinstaller prior to 3.1 is platform x64-mingw32
["2.6.10:2.5.9:2.4.10", "2.5.9"],
["3.0.7:2.7.8", "3.1.6"],
]
else
[
["2.6.0:2.5.0:2.4.0", "2.5.9"],
["3.4.0:3.3.5:3.2.0:3.1.0:3.0.0:2.7.0", "3.1.3"],
["2.6.10:2.5.9:2.4.10", "2.5.9"],
["3.4.1:3.3.5:3.2.6:3.1.2:3.0.7:2.7.8", "3.1.6"],
]
end

Expand Down Expand Up @@ -215,8 +215,8 @@ RUN echo 'source /etc/profile.d/rcd-env.sh' >> /etc/rubybashrc
# Install sudoers configuration
COPY build/sudoers /etc/sudoers.d/rake-compiler-dock

RUN bash -c "rbenv global 3.1.3"
RUN bash -c "rbenv global 3.1.6"

ENV RUBY_CC_VERSION=3.4.0:3.3.5:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0:2.5.0:2.4.0
ENV RUBY_CC_VERSION=3.4.1:3.3.5:3.2.6:3.1.2:3.0.7:2.7.8:2.6.10:2.5.9:2.4.10

CMD bash

0 comments on commit 5eff8e1

Please sign in to comment.