rake-compiler-dock 1.9.1 → 1.11.0.rc1

data/{History.md → CHANGELOG.md}

@@ -1,5 +1,42 @@
 # `rake-compiler/rake-compiler-dock` Changelog
 
+## 1.11.0.rc1 / 2025-12-18
+
+### Changes
+
+- Add Ruby 4.0.0-preview2 cross-compilation support. @flavorjones
+- Bump Ruby 3.3 to v3.3.10 (from v3.3.9) @flavorjones
+- Bump Ruby 3.4 to v3.4.8 (from v3.4.5) @flavorjones
+- Bump rake-compiler dependency to v1.3.1 (from v1.2.9) @flavorjones
+- The default `rbenv` ruby in the container is now Ruby v3.4.8 (previously the default was 3.4.5).
+- Optimized images by improving layer sharing. @larskanis
+
+### CRuby container summary
+
+- native rubies: 4.0.0-preview2, 3.4.8 (default), 3.1.7
+- `RUBY_CC_VERSION=4.0.0:3.4.8:3.3.10:3.2.9:3.1.7:3.0.7:2.7.8`
+
+
+## 1.10.0 / 2025-10-25
+
+### Changes
+
+- Add support for ARM64 host images and release rake-compiler-dock host images for ARM64 and x86_64. #140
+- Add new target platform `aarch64-mingw-ucrt` aka Windows on ARM. #152
+- Allow easier selection of the ruby run in the container. #151
+- Install `mig` which is a Macos specific RPC code generator. #155
+- Add `RCD_IMAGE_VERSION` env var to easily set image version or `snapshot`. #163
+- Disable `rpath` in cross compiled C extensions, since it is only valid in the build environment. #165
+- Drop support for Ruby 2.4, 2.5, and 2.6. #153 @ianks @flavorjones
+- Remove `rbenv` ruby version 2.5.9 from the build container. #153 @ianks @flavorjones
+- Rename `History.md` to `CHANGELOG.md` which is more common.
+
+### CRuby container summary
+
+- native rubies: 3.4.5 (default), 3.1.7
+- `RUBY_CC_VERSION=3.4.5:3.3.9:3.2.9:3.1.7:3.0.7:2.7.8`
+
+
 ## v1.9.1 / 2025-01-20
 
 ### Features

data/CONTRIBUTING.md

@@ -6,7 +6,7 @@ This document is intended for the rake-compiler-dock contributors.
 
 - prep
   - [ ] make sure CI is green!
-  - [ ] update `History.md` and `lib/rake_compiler_dock/version.rb`
+  - [ ] update `CHANGELOG.md` and `lib/rake_compiler_dock/version.rb`
   - [ ] commit and create a git tag
 - option 1: build locally
   - build
@@ -64,3 +64,46 @@ docker buildx create --use --driver=docker-container
 bundle exec rake build
 ```
 
+
+### Create builder instance for two architectures
+
+Building with qemu emulation fails currently with a segfault, so that it must be built by a builder instance with at least one remote node for the other architecture.
+Building on native hardware is also much faster (~45 minutes) than on qemu.
+A two-nodes builder requires obviously a ARM and a Intel/AMD device.
+It can be created like this:
+
+```sh
+# Make sure the remote instance can be connected
+$ docker -H ssh://isa info
+
+# Create a new builder with the local instance
+# Disable the garbage collector by the config file
+$ docker buildx create --name isayoga --config build/buildkitd.toml
+
+# Add the remote instance
+$ docker buildx create --name isayoga --config build/buildkitd.toml --append ssh://isa
+
+# They are inactive from the start
+$ docker buildx ls
+NAME/NODE      DRIVER/ENDPOINT                   STATUS     BUILDKIT   PLATFORMS
+isayoga        docker-container
+ \_ isayoga0    \_ unix:///var/run/docker.sock   inactive
+ \_ isayoga1    \_ ssh://isa                     inactive
+default*       docker
+ \_ default     \_ default                       running    v0.13.2    linux/arm64
+
+# Bootstrap the instances
+$ docker buildx inspect --bootstrap --builder isayoga
+
+# Set the new builder as default
+$ docker buildx use isayoga
+
+# Now it should be default and in state "running"
+$ docker buildx ls
+NAME/NODE      DRIVER/ENDPOINT                   STATUS    BUILDKIT   PLATFORMS
+isayoga*       docker-container
+ \_ isayoga0    \_ unix:///var/run/docker.sock   running   v0.18.2    linux/arm64
+ \_ isayoga1    \_ ssh://isa                     running   v0.18.2    linux/amd64, linux/amd64/v2, linux/amd64/v3, linux/386
+default        docker
+ \_ default     \_ default                       running   v0.13.2    linux/arm64
+```

data/Dockerfile.jruby

@@ -48,9 +48,9 @@ COPY build/patches /home/rubyuser/patches
 RUN bash -c " \
       for v in ${RBENV_RUBIES} ; do \
         rbenv shell \$v && \
-        gem install rake-compiler -v1.2.9 && \
-        cd ${RBENV_ROOT}/versions/\$v/lib/ruby/gems/*/gems/rake-compiler-1.2.9 && \
-        for patch in /home/rubyuser/patches/rake-compiler-1.2.9/*.patch ; do \
+        gem install rake-compiler -v1.3.1 && \
+        cd ${RBENV_ROOT}/versions/\$v/lib/ruby/gems/*/gems/rake-compiler-1.3.1 && \
+        for patch in /home/rubyuser/patches/rake-compiler-1.3.1/*.patch ; do \
           patch -p1 < \$patch ; \
         done \
       done \

data/Dockerfile.mri.erb

@@ -1,6 +1,8 @@
 <% image = "ubuntu:20.04" %>
 FROM <%= image %>
 
+ARG TARGETPLATFORM
+
 ##
 ## Install required base packages for compiling ruby
 ##
@@ -10,43 +12,6 @@ RUN apt-get -y update && \
     apt-get install -y autoconf cmake pkg-config zlib1g-dev libreadline-dev libsqlite0-dev libssl-dev libyaml-dev libffi-dev && \
     rm -rf /var/lib/apt/lists/*
 
-##
-## Install cross compilers
-##
-<% if platform =~ /x64-mingw-ucrt/ %>
-COPY --from=larskanis/mingw64-ucrt:20.04 \
-    /build/binutils-mingw-w64-x86-64_*.deb \
-    /build/g++-mingw-w64-x86-64_*.deb \
-    /build/gcc-mingw-w64-base_*.deb \
-    /build/gcc-mingw-w64-x86-64_*.deb \
-    /build/mingw-w64-common_*.deb \
-    /build/mingw-w64-x86-64-dev_*.deb \
-    /debs/
-RUN dpkg -i /debs/*.deb
-
-<% elsif platform =~ /linux-musl/ %>
-COPY build/mk_musl_cross.sh /tmp
-RUN /tmp/mk_musl_cross.sh <%= target %>
-
-<% else %>
-RUN apt-get -y update && \
-    apt-get install -y <%
-if platform =~ /darwin/            %> clang python lzma-dev libxml2-dev libssl-dev libc++-10-dev <% end %><%
-if platform =~ /aarch64-linux-gnu/ %> gcc-aarch64-linux-gnu g++-aarch64-linux-gnu <% end %><%
-if platform =~ /arm-linux-gnu/     %> gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf <% end %><%
-if platform =~ /x86-linux-gnu/     %> gcc-i686-linux-gnu g++-i686-linux-gnu <% end %><%
-if platform =~ /x86_64-linux-gnu/  %> gcc-x86-64-linux-gnu g++-x86-64-linux-gnu <% end %><%
-if platform =~ /x86-mingw32/       %> gcc-mingw-w64-i686 g++-mingw-w64-i686 <% end %><%
-if platform =~ /x64-mingw32/       %> gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 <% end %> && \
-    rm -rf /var/lib/apt/lists/*
-<% end %>
-
-<% if platform =~ /darwin/ %>
-COPY build/mk_osxcross.sh /tmp
-RUN /tmp/mk_osxcross.sh
-<% end %>
-
-
 ##
 ##  install rbenv and ruby-build
 ##
@@ -74,7 +39,7 @@ ENV BASH_ENV=/etc/rubybashrc
 ##
 USER rubyuser
 
-ENV RBENV_RUBIES="2.5.9 3.1.6 3.4.1"
+ENV RBENV_RUBIES="3.1.7 3.4.8 4.0.0-preview2"
 
 # Install the bootstrap rubies
 RUN bash -c " \
@@ -91,9 +56,9 @@ COPY build/patches /home/rubyuser/patches
 RUN bash -c " \
   for v in ${RBENV_RUBIES} ; do \
     rbenv shell \$v && \
-    gem install rake-compiler -v1.2.9 && \
-    cd ${RBENV_ROOT}/versions/\$v/lib/ruby/gems/*/gems/rake-compiler-1.2.9 && \
-    for patch in /home/rubyuser/patches/rake-compiler-1.2.9/*.patch ; do \
+    gem install rake-compiler -v1.3.1 && \
+    cd ${RBENV_ROOT}/versions/\$v/lib/ruby/gems/*/gems/rake-compiler-1.3.1 && \
+    for patch in /home/rubyuser/patches/rake-compiler-1.3.1/*.patch ; do \
       patch -p1 < \$patch ; \
     done \
   done \
@@ -104,9 +69,80 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
     sudo chown rubyuser.rubyuser /usr/local/rake-compiler && \
     ln -s /usr/local/rake-compiler ~/.rake-compiler
 
+USER root
+
+##
+## Install cross compilers
+##
+<% if platform =~ /x64-mingw-ucrt/ %>
+COPY --from=larskanis/mingw64-ucrt:20.04 \
+    /build/binutils-mingw-w64-x86-64_*.deb \
+    /build/g++-mingw-w64-x86-64_*.deb \
+    /build/gcc-mingw-w64-base_*.deb \
+    /build/gcc-mingw-w64-x86-64_*.deb \
+    /build/mingw-w64-common_*.deb \
+    /build/mingw-w64-x86-64-dev_*.deb \
+    /debs/
+RUN dpkg -i /debs/*.deb
+
+<% elsif platform =~ /aarch64-mingw-ucrt/ %>
+
+RUN <<EOF
+    if [ "$TARGETPLATFORM" = "linux/amd64" ]; then
+        DOWNLOAD_PLATFORM="x86_64";
+    elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then
+        DOWNLOAD_PLATFORM="aarch64";
+    else
+        echo "Unsupported platform $TARGETPLATFORM";
+        exit 1;
+    fi &&
+    wget https://github.com/mstorsjo/llvm-mingw/releases/download/20250114/llvm-mingw-20250114-ucrt-ubuntu-20.04-$DOWNLOAD_PLATFORM.tar.xz &&
+    tar xf llvm-mingw*.tar.xz &&
+    mv `ls -d llvm-mingw-*/` /llvm-mingw &&
+    echo "export PATH=/llvm-mingw/bin:\$PATH" >> /etc/rubybashrc &&
+    rm -r /llvm-mingw/bin/i686-w64* /llvm-mingw/bin/armv7-w64* /llvm-mingw/bin/x86_64-w64* /llvm-mingw/i686-w64* /llvm-mingw/armv7-w64* /llvm-mingw/x86_64-w64*
+EOF
+
+<% elsif platform =~ /linux-musl/ %>
+COPY build/mk_musl_cross.sh /tmp
+RUN /tmp/mk_musl_cross.sh <%= target %>
+
+<% else %>
+RUN apt-get -y update && \
+    apt-get install -y <%
+if platform =~ /darwin/            %> clang python lzma-dev libxml2-dev libssl-dev libc++-10-dev <% end %><%
+if platform =~ /aarch64-linux-gnu/ %> gcc-aarch64-linux-gnu g++-aarch64-linux-gnu <% end %><%
+if platform =~ /arm-linux-gnu/     %> gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf <% end %><%
+if platform =~ /x86-linux-gnu/     %> gcc-i686-linux-gnu g++-i686-linux-gnu <% end %><%
+if platform =~ /x86_64-linux-gnu/  %> gcc-x86-64-linux-gnu g++-x86-64-linux-gnu <% end %><%
+if platform =~ /x86-mingw32/       %> gcc-mingw-w64-i686 g++-mingw-w64-i686 <% end %><%
+if platform =~ /x64-mingw32/       %> gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 <% end %> && \
+    rm -rf /var/lib/apt/lists/*
+<% end %>
+
+<% if platform =~ /darwin/ %>
+COPY build/mk_osxcross.sh /tmp
+RUN /tmp/mk_osxcross.sh
+
+# Install mig which is a Macos specific RPC code generator, which is part of xcode
+RUN apt-get -y update && \
+    apt-get install -y bison flex && \
+    rm -rf /var/lib/apt/lists/*
+RUN git clone --branch=cross_platform https://github.com/markmentovai/bootstrap_cmds && \
+    cd bootstrap_cmds && \
+    autoreconf --install && \
+    sh configure && \
+    make && \
+    sed -E -i 's/^cppflags=(.*)/cppflags=(\1 "-D<%= platform =~ /arm64/ ? "__arm64__" : "__x86_64__" %>" "-I\/opt\/osxcross\/target\/SDK\/MacOSX11.1.sdk\/usr\/include")/' migcom.tproj/mig.sh && \
+    sudo make install && \
+    cd .. && \
+    rm -rf bootstrap_cmds
+<% end %>
+
+USER rubyuser
+
 <%
 #
-# Build ruby versions prior to ruby2_keywords using ruby-2.5
 # Build ruby versions with ruby2_keywords using ruby-3.x
 #
 # Note that parallel builds of ruby with make flag `-j` are often flaky, see
@@ -115,23 +151,27 @@ 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.1:3.3.7:3.2.6:3.1.6", "3.4.1"],
+    ["3.4.8:3.3.10:3.2.9:3.1.7", "3.4.8"],
+    ["4.0.0-preview2", "4.0.0-preview2"],
+  ]
+elsif platform =~ /aarch64-mingw-ucrt/
+  [
+    ["3.4.8", "3.1.7"],
   ]
 elsif platform =~ /x64-mingw32/
   [
     # 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"],
+    ["3.0.7:2.7.8", "3.1.7"],
   ]
 else
   [
-    ["2.6.10:2.5.9:2.4.10", "2.5.9"],
-    ["2.7.8", "3.1.6"],
-    ["3.4.1:3.3.7:3.2.6:3.1.6:3.0.7", "3.4.1"],
+    ["2.7.8", "3.1.7"],
+    ["3.4.8:3.3.10:3.2.9:3.1.7:3.0.7", "3.4.8"],
+    ["4.0.0-preview2", "4.0.0-preview2"],
   ]
 end
 
-strip = '-s' if platform !~ /darwin/
+strip = '-s' if platform !~ /darwin|aarch64-mingw/
 
 xrubies_build_plan.each do |xrubies, bootstrap_ruby_version| %>
 RUN bash -c " \
@@ -139,7 +179,7 @@ RUN bash -c " \
   export CPPFLAGS='<%= "-D__USE_MINGW_ANSI_STDIO=1" if platform =~ /x64-mingw-ucrt/ %>' && \
   export CFLAGS='-O1 -fno-omit-frame-pointer -fno-fast-math -fstack-protector-strong <%= strip %>' && \
   export LDFLAGS='-pipe <%= strip %>' && \
-  <%= "export LIBS='-l:libssp.a' &&" if platform =~ /mingw/ %> \
+  <%= "export LIBS='-l:libssp.a -lpthread' &&" if platform =~ /mingw/ %> \
   <%= "export CC=#{target}-clang &&" if platform =~ /darwin/ %> \
   export MAKE='make V=1' && \
   rake-compiler cross-ruby VERSION=<%= xrubies %> HOST=<%= target %> && \
@@ -160,15 +200,10 @@ RUN find /usr/local/rake-compiler/ruby/*linux*/ -name mkmf.rb | while read f ; d
 <% if platform =~ /mingw/ %>
 # RubyInstaller doesn't install libgcc -> link it static.
 RUN find /usr/local/rake-compiler/ruby/*mingw*/ -name rbconfig.rb | while read f ; do sed -i 's/."LDFLAGS". = "/&-static-libgcc /' $f ; done
-# Raise Windows-API to Vista (affects ruby < 2.6 only)
-RUN find /usr/local/rake-compiler/ruby -name rbconfig.rb | while read f ; do sed -i 's/0x0501/0x0600/' $f ; done
 # Don't link to static libruby
 RUN find /usr/local/rake-compiler/ruby -name lib*-ruby*.dll.a | while read f ; do n=`echo $f | sed s/.dll//` ; mv $f $n ; done
 <% end %>
 
-# ruby-2.5 links to libcrypt, which isn't necessary for extensions
-RUN find /usr/local/rake-compiler/ruby -name rbconfig.rb | while read f ; do sed -i 's/-lcrypt//' $f ; done
-
 <% if platform =~ /darwin/ %>
 # for rubies which use `-bundle_loader` on darwin
 # - the upstream change: https://github.com/ruby/ruby/pull/6193
@@ -187,7 +222,7 @@ RUN find /usr/local/rake-compiler/ruby/*/*/lib/ruby -name rbconfig.rb | while re
 ##
 USER root
 
-<% if platform =~ /mingw/ %>
+<% if platform =~ /(x64|x86)-mingw/ %>
 # Install wrappers for strip commands as a workaround for "Protocol error" in boot2docker.
 COPY build/strip_wrapper_vbox /root/
 RUN mv /usr/bin/<%= target %>-strip /usr/bin/<%= target %>-strip.bin && \
@@ -200,6 +235,16 @@ RUN printf "1\n" | update-alternatives --config <%= target %>-gcc && \
     printf "1\n" | update-alternatives --config <%= target %>-g++
 <% end %>
 
+<% if platform =~ /aarch64-mingw/ %>
+# Fool libtool to allow building a shared library although linking to libclang_rt.builtins-aarch64.a
+#
+# Linker option "-llibclang_rt.builtins-aarch64.a" is required on Windows on ARM when compiling C++ and when clang is called with -nostdlib (due to be invoked by libtool).
+# Unfortunately libtool then forces a static build.
+# This is a ugly hack to make libtool beleave that the library is a DLL instead of an archive and to allow building a DLL instand.
+#
+RUN sudo cp /llvm-mingw/aarch64-w64-mingw32/bin/libc++.dll /llvm-mingw/aarch64-w64-mingw32/lib/libclang_rt.builtins-aarch64.0
+<% end %>
+
 <% if platform =~ /darwin/ %>
 # Install wrapper around strip to re-sign binaries (ad-hoc signature)
 COPY build/strip_wrapper_codesign /root/
@@ -224,8 +269,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.1"
+RUN bash -c "rbenv global 3.4.8"
 
-ENV RUBY_CC_VERSION=3.4.1:3.3.7:3.2.6:3.1.6:3.0.7:2.7.8:2.6.10:2.5.9:2.4.10
+ENV RUBY_CC_VERSION=4.0.0:3.4.8:3.3.10:3.2.9:3.1.7:3.0.7:2.7.8
 
 CMD bash

data/README.md

@@ -2,7 +2,7 @@
 
 **Easy to use and reliable cross compiler environment for building Windows, Linux, Mac and JRuby binary gems.**
 
-It provides cross compilers and Ruby environments for 2.4 and newer versions of the [RubyInstaller](http://rubyinstaller.org/) and Linux runtime environments.
+It provides cross compilers and Ruby environments for 2.6 and newer versions of the [RubyInstaller](http://rubyinstaller.org/) and Linux runtime environments.
 They are prepared for use with [rake-compiler](https://github.com/rake-compiler/rake-compiler).
 It is used by [many gems with C or JRuby extentions](https://github.com/rake-compiler/rake-compiler-dock/wiki/Projects-using-rake-compiler-dock).
 
@@ -16,6 +16,7 @@ The following platforms are supported for cross-compilation by rake-compiler-doc
 
 - `aarch64-linux` and `aarch64-linux-gnu`
 - `aarch64-linux-musl`
+- `aarch64-mingw-ucrt`
 - `arm-linux` and `arm-linux-gnu`
 - `arm-linux-musl`
 - `arm64-darwin`
@@ -72,8 +73,6 @@ Ruby version 3.1 and later ship with a sufficient Rubygems version. For earlier
 - ruby: "3.0", rubygems: "3.5.5" # or possibly higher
 - ruby: "2.7", rubygems: "3.4.22"
 - ruby: "2.6", rubygems: "3.4.22"
-- ruby: "2.5", rubygems: "3.3.26"
-- ruby: "2.4", rubygems: "3.3.26"
 
 **It's strongly suggested that you use rake-compiler v1.2.7 or later to build `linux-musl` and/or `linux-gnu` native gems.** That version of rake-compiler sets `required_rubygems_version` automatically in the native platform gems' gemspecs.
 
@@ -193,6 +192,7 @@ This can be done like this:
 PLATFORMS = %w[
   aarch64-linux-gnu
   aarch64-linux-musl
+  aarch64-mingw-ucrt
   arm-linux-gnu
   arm-linux-musl
   arm64-darwin
@@ -207,7 +207,8 @@ PLATFORMS = %w[
 ]
 task 'gem:native' do
   require 'rake_compiler_dock'
-  sh "bundle package --all"   # Avoid repeated downloads of gems by using gem files from the host.
+  sh "bundle config set cache_all true"   # Avoid repeated downloads of gems by using gem files from the host.
+  sh "bundle package"
   PLATFORMS.each do |plat|
     RakeCompilerDock.sh "bundle --local && rake native:#{plat} gem", platform: plat
   end
@@ -231,7 +232,8 @@ Please note, that parallel builds only work reliable, if the specific platform g
     task 'prepare' do
       require 'rake_compiler_dock'
       require 'io/console'
-      sh "bundle package --all"
+      sh "bundle config set cache_all true"
+      sh "bundle package"
       sh "cp ~/.gem/gem-*.pem build/gem/ || true"
       ENV["GEM_PRIVATE_KEY_PASSPHRASE"] = STDIN.getpass("Enter passphrase of gem signature key: ")
     end
@@ -313,6 +315,7 @@ OCI images snapshotted from `main` are published weekly to Github Container Regi
 - `ghcr.io/rake-compiler/rake-compiler-dock-image:snapshot-mri-x86_64-linux-gnu`
 
 These images are intended for integration testing. They may not work properly and should not be considered production ready.
+Snapshot images can be used by setting `RCD_IMAGE_VERSION` environment variable.
 
 
 ## Environment Variables
@@ -328,6 +331,9 @@ The following variables are recognized by rake-compiler-dock:
     It is ignored when `rubyvm` is set to `:jruby`.
 * `RCD_IMAGE` - The docker image that is downloaded and started.
     Defaults to "ghcr.io/rake-compiler/rake-compiler-dock-image:IMAGE_VERSION-PLATFORM" with an image version that is determined by the gem version.
+* `RCD_IMAGE_VERSION` - The docker image version that is downloaded and started.
+    Defaults to the version of the rake-compiler-dock gem in use.
+    Can be set to `snapshot` in order to use the latest images from main branch.
 
 The following variables are passed through to the docker container without modification:
 
@@ -352,6 +358,42 @@ Other environment variables can be set or passed through to the container like t
 RakeCompilerDock.sh "rake cross native gem OPENSSL_VERSION=#{ENV['OPENSSL_VERSION']}"
 ```
 
+### Choosing the version of ruby to run in the build container
+
+There are [multiple versions of Ruby installed in the build container](https://github.com/rake-compiler/rake-compiler-dock/blob/d3e6b44916d9d63d4c431b8c749a2c58bf1fe8e8/Dockerfile.mri.erb#L77). The latest version will be the default, but you may need to choose a different version to run during your build process.
+
+You can do this by passing a `ruby:` keyword argument to `RakeCompilerDock.sh`:
+
+```ruby
+RakeCompilerDock.sh "ruby -v"
+# => ruby 3.4.1 (2024-12-25 revision 48d4efcb85) +PRISM [x86_64-linux]
+
+RakeCompilerDock.sh "ruby -v", ruby: "3.1.6"
+# => ruby 3.1.6p260 (2024-05-29 revision a777087be6) [x86_64-linux]48d4efcb85) +PRISM [x86_64-linux]
+```
+
+Or by setting the environment variable `RCD_RUBY_VERSION`:
+
+``` sh
+$ rake-compiler-dock bash -c "ruby -v"
+ruby 3.4.1 (2024-12-25 revision 48d4efcb85) +PRISM [x86_64-linux]
+
+$ RCD_RUBY_VERSION=3.1.6 rake-compiler-dock bash -c "ruby -v"
+ruby 3.1.6p260 (2024-05-29 revision a777087be6) [x86_64-linux]
+```
+
+Or by running `rbenv shell` in the command:
+
+``` ruby
+RakeCompilerDock.sh "rbenv shell 3.1.6 && ruby -v", platform: "x86_64-linux-gnu"
+# => ruby 3.1.6p260 (2024-05-29 revision a777087be6) [x86_64-linux]
+```
+
+``` sh
+$ rake-compiler-dock bash -c "rbenv shell 3.1.6 && ruby -v"
+ruby 3.1.6p260 (2024-05-29 revision a777087be6) [x86_64-linux]
+```
+
 ### Choosing specific Ruby versions to support
 
 If you only want to precompile for certain Ruby versions, you can specify those versions by overwriting the `RUBY_CC_VERSION` environment variable.
@@ -362,7 +404,7 @@ For example, if you wanted to only support Ruby 3.4 and 3.3, you might set this
 ENV["RUBY_CC_VERSION"] = "3.4.1:3.3.7"
 ```
 
-In practice, though, hardcoding these versions is brittle because the patch versions in the container may very from release to release.
+In practice, though, hardcoding these versions is brittle because the patch versions in the container may vary from release to release.
 
 A more robust way to do this is to use `RakeCompilerDock.ruby_cc_version` which accepts an array of Ruby minor versions or patch version requirements.