diff --git a/Dockerfile.mri.erb b/Dockerfile.mri.erb index ba8656f..cbc086a 100644 --- a/Dockerfile.mri.erb +++ b/Dockerfile.mri.erb @@ -108,7 +108,7 @@ ENV BASH_ENV=/etc/rubybashrc ## USER rubyuser -ENV RBENV_RUBIES="3.1.7 3.4.5" +ENV RBENV_RUBIES="3.1.7 3.4.7" # Install the bootstrap rubies RUN bash -c " \ @@ -148,11 +148,11 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \ xrubies_build_plan = if platform =~ /x64-mingw-ucrt/ [ # Rubyinstaller-3.1+ is platform x64-mingw-ucrt - ["3.4.5:3.3.9:3.2.9:3.1.7", "3.4.5"], + ["3.4.7:3.3.10:3.2.9:3.1.7", "3.4.7"], ] elsif platform =~ /aarch64-mingw-ucrt/ [ - ["3.4.5", "3.1.7"], + ["3.4.7", "3.1.7"], ] elsif platform =~ /x64-mingw32/ [ @@ -162,7 +162,7 @@ elsif platform =~ /x64-mingw32/ else [ ["2.7.8", "3.1.7"], - ["3.4.5:3.3.9:3.2.9:3.1.7:3.0.7", "3.4.5"], + ["3.4.7:3.3.10:3.2.9:3.1.7:3.0.7", "3.4.7"], ] end @@ -264,8 +264,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.4.5" +RUN bash -c "rbenv global 3.4.7" -ENV RUBY_CC_VERSION=3.4.5:3.3.9:3.2.9:3.1.7:3.0.7:2.7.8 +ENV RUBY_CC_VERSION=3.4.7:3.3.10:3.2.9:3.1.7:3.0.7:2.7.8 CMD bash diff --git a/lib/rake_compiler_dock.rb b/lib/rake_compiler_dock.rb index ecd8794..16099a6 100644 --- a/lib/rake_compiler_dock.rb +++ b/lib/rake_compiler_dock.rb @@ -82,8 +82,8 @@ def exec(*args, &block) # # RakeCompilerDock.cross_rubies # # => { - # # "3.4" => "3.4.5", - # # "3.3" => "3.3.9", + # # "3.4" => "3.4.7", + # # "3.3" => "3.3.10", # # "3.2" => "3.2.9", # # "3.1" => "3.1.7", # # "3.0" => "3.0.7", @@ -92,8 +92,8 @@ def exec(*args, &block) # def cross_rubies { - "3.4" => "3.4.5", - "3.3" => "3.3.9", + "3.4" => "3.4.7", + "3.3" => "3.3.10", "3.2" => "3.2.9", "3.1" => "3.1.7", "3.0" => "3.0.7", @@ -112,13 +112,13 @@ def cross_rubies # # For example: # RakeCompilerDock.ruby_cc_version("2.7", "3.4") - # # => "3.4.5:2.7.8" + # # => "3.4.7:2.7.8" # # RakeCompilerDock.ruby_cc_version("~> 3.2") - # # => "3.4.5:3.3.9:3.2.9" + # # => "3.4.7:3.3.10:3.2.9" # # RakeCompilerDock.ruby_cc_version(Gem::Requirement.new("~> 3.2")) - # # => "3.4.5:3.3.9:3.2.9" + # # => "3.4.7:3.3.10:3.2.9" # def ruby_cc_version(*requirements) cross = cross_rubies