rake-compiler-dock 1.2.1 → 1.3.0

data/Dockerfile.mri.erb

@@ -8,9 +8,12 @@ manylinux = !!(image =~ /manylinux/)
 %>
 FROM <%= image %>
 
+##
+## RVM and native rubies
+##
+# Install packages which rvm will require
 <% if manylinux %>
-# install packages which rvm will require
-RUN yum install -y autoconf gcc-c++ libtool readline-devel sqlite-devel ruby openssl-devel xz cmake sudo less libffi-devel git wget
+RUN yum install -y sudo ruby less git wget curl autoconf libtool cmake gcc-c++ xz readline-devel sqlite-devel openssl-devel libffi-devel libyaml-devel
 
 # Prepare sudo and delete sudo as alias to gosu
 RUN rm -f /usr/local/bin/sudo && \
@@ -19,7 +22,7 @@ RUN rm -f /usr/local/bin/sudo && \
 <% else %>
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get -y update && \
-    apt-get install -y curl git-core xz-utils build-essential zlib1g-dev libreadline-dev libssl-dev wget unzip sudo gnupg2 dirmngr cmake pkg-config && \
+    apt-get install -y sudo wget autoconf cmake curl git-core pkg-config build-essential xz-utils unzip gnupg2 dirmngr zlib1g-dev libreadline-dev libsqlite0-dev libssl-dev libyaml-dev libffi-dev && \
     rm -rf /var/lib/apt/lists/*
 <% end %>
 
@@ -42,37 +45,34 @@ RUN mkdir ~/.gnupg && \
 RUN gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB && \
     (curl -L http://get.rvm.io | sudo bash) && \
     bash -c " \
-        source /etc/rubybashrc && \
-        rvm autolibs disable && \
-        rvmsudo rvm cleanup all "
+      source /etc/rubybashrc && \
+      rvm autolibs disable && \
+      rvmsudo rvm cleanup all \
+    "
 
-# Import patch files for ruby and gems
+# Install native rubies and fix permissions
 COPY build/patches /home/rvm/patches/
-
-# install rubies and fix permissions on
-ENV RVM_RUBIES 2.5.9 3.1.0
+ENV RVM_RUBIES 2.5.9 3.1.3
 RUN bash -c " \
-    export CFLAGS='-s -O3 -fno-fast-math -fPIC' && \
-    for v in ${RVM_RUBIES} ; do \
+      export CFLAGS='-s -O3 -fno-fast-math -fPIC' && \
+      for v in ${RVM_RUBIES} ; do \
         rvm install \$v --patch \$(echo ~/patches/ruby-\$v/* | tr ' ' ','); \
-    done && \
-    rvm cleanup all && \
-    find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw "
-
-# Install rake-compiler and typical gems in all Rubies
-# do not generate documentation for gems
-RUN echo "gem: --no-ri --no-rdoc" >> ~/.gemrc && \
-    bash -c " \
-        rvm all do gem update --system --no-document && \
-        rvm all do gem install --no-document bundler 'bundler:~>1.16' 'rake-compiler:1.1.6' hoe mini_portile rubygems-tasks mini_portile2 && \
-        find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw "
+      done && \
+      rvm cleanup all && \
+      find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw \
+    "
 
-# Install rake-compiler's cross rubies in global dir instead of /root
-RUN sudo mkdir -p /usr/local/rake-compiler && \
-    sudo chown rvm.rvm /usr/local/rake-compiler && \
-    ln -s /usr/local/rake-compiler ~/.rake-compiler
-
-# Add cross compilers for Windows and Linux
+RUN bash -c " \
+      echo "gem: --no-ri --no-rdoc" >> ~/.gemrc && \
+      rvm all do gem update --system --no-document && \
+      rvm all do gem update --no-document && \
+      rvm all do gem install bundler --no-document && \
+      find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw \
+    "
+
+##
+## Cross compilers
+##
 USER root
 
 <% if platform=~/x64-mingw-ucrt/ %>
@@ -97,89 +97,58 @@ if platform=~/x64-mingw32/   %> gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 <% end
     rm -rf /var/lib/apt/lists/*
 <% end %>
 
-RUN bash -c " \
-        rvm alias create default 3.1.0 && \
-        rvm use default "
-
 <% if manylinux %>
 # Create dev tools x86-linux-*
 COPY build/mk_i686.rb /root/
-RUN bash -c " \
-        ruby /root/mk_i686.rb "
+RUN /root/mk_i686.rb
 <% end %>
 
 <% if platform=~/darwin/ %>
-RUN git clone -q --depth=1 https://github.com/tpoechtrager/osxcross.git /opt/osxcross && rm -rf /opt/osxcross/.git && \
-    cd /opt/osxcross/tarballs && \
-    curl -L -o MacOSX11.1.sdk.tar.xz https://github.com/larskanis/MacOSX-SDKs/releases/download/11.1/MacOSX11.1.sdk.tar.xz && \
-    tar -xf MacOSX11.1.sdk.tar.xz -C . && \
-    cp -rf /usr/lib/llvm-10/include/c++ MacOSX11.1.sdk/usr/include/c++ && \
-    cp -rf /usr/include/x86_64-linux-gnu/c++/9/bits/ MacOSX11.1.sdk/usr/include/c++/v1/bits && \
-    tar -cJf MacOSX11.1.sdk.tar.xz MacOSX11.1.sdk && \
-    cd /opt/osxcross && \
-    UNATTENDED=1 SDK_VERSION=11.1 OSX_VERSION_MIN=10.13 USE_CLANG_AS=1 ./build.sh && \
-    ln -s /usr/bin/llvm-config-10 /usr/bin/llvm-config && \
-    ENABLE_COMPILER_RT_INSTALL=1 SDK_VERSION=11.1 ./build_compiler_rt.sh && \
-    rm -rf *~ build tarballs/*
-
-RUN echo "export PATH=/opt/osxcross/target/bin:\$PATH" >> /etc/rubybashrc && \
-    echo "export MACOSX_DEPLOYMENT_TARGET=10.13" >> /etc/rubybashrc && \
-    echo "export OSXCROSS_MP_INC=1" >> /etc/rubybashrc
-
-# Add links to build tools without target version kind of:
-#   arm64-apple-darwin-clang   =>   arm64-apple-darwin20.1-clang
-RUN rm /opt/osxcross/target/bin/*-apple-darwin-* ; \
-    find /opt/osxcross/target/bin/ -name '*-apple-darwin[0-9]*' | sort | while read f ; do d=`echo $f | sed s/darwin[0-9\.]*/darwin/`; echo $f '"$@"' | tee $d && chmod +x $d ; done
-
-# There's no objdump in osxcross but we can use llvm's
-RUN ln -s /usr/lib/llvm-10/bin/llvm-objdump /opt/osxcross/target/bin/x86_64-apple-darwin-objdump && \
-    ln -s /usr/lib/llvm-10/bin/llvm-objdump /opt/osxcross/target/bin/aarch64-apple-darwin-objdump
-
+COPY build/mk_osxcross.sh /home/rvm
+RUN /home/rvm/mk_osxcross.sh
 <% end %>
 
-# Patch rake-compiler to build and install static libraries for Linux rubies
+
+##
+## Cross-compile rubies
+##
 USER rvm
+
+RUN bash -c "rvm all do gem install --no-document rake-compiler:1.2.1"
+
+# Install rake-compiler's cross rubies in global dir instead of /root
+RUN sudo mkdir -p /usr/local/rake-compiler && \
+    sudo chown rvm.rvm /usr/local/rake-compiler && \
+    ln -s /usr/local/rake-compiler ~/.rake-compiler
+
+# Patch rake-compiler to build and install static libraries for Linux rubies
 COPY build/patches2 /home/rvm/patches/
 RUN bash -c " \
-    for v in ${RVM_RUBIES} ; do \
-      cd /usr/local/rvm/gems/ruby-\$v/gems/rake-compiler-1.1.6 && \
-      echo applying patches to ruby-\$v /home/rvm/patches/rake-compiler-1.1.6/*.patch && \
-      ( git apply /home/rvm/patches/rake-compiler-1.1.6/*.patch || true ) \
-    done "
-
-# Patch rubies for cross build
-#USER root
-#RUN bash -c " \
-#    for v in 2.7.0 3.0.0 3.1.0 ; do \
-#      curl -SL http://cache.ruby-lang.org/pub/ruby/\${v:0:3}/ruby-\$v.tar.xz | tar -xJC /root/ && \
-#      cd /root/ruby-\$v && \
-#      git apply /home/rvm/patches/ruby-\$v/*.patch && \
-#      cd .. && \
-#      mkdir -p /usr/local/rake-compiler/sources/ && \
-#      tar cjf /usr/local/rake-compiler/sources/ruby-\$v.tar.bz2 ruby-\$v && \
-#      chown rvm /usr/local/rake-compiler -R && \
-#      rm -rf /root/ruby-\$v ; \
-#    done "
-#USER rvm
+      for v in ${RVM_RUBIES} ; do \
+        cd /usr/local/rvm/gems/ruby-\$v/gems/rake-compiler-1.2.1 && \
+        echo applying patches to ruby-\$v /home/rvm/patches/rake-compiler-1.2.1/*.patch && \
+        ( git apply /home/rvm/patches/rake-compiler-1.2.1/*.patch || true ) \
+      done \
+    "
 
 <%
 axrubies = if platform =~ /x64-mingw-ucrt/
   [
     # Rubyinstaller-3.1.0+ is platform x64-mingw-ucrt
-    ["3.1.0", "3.1.0", true],
+    ["3.2.0:3.1.0", "3.1.3", true],
   ]
 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", false],
-    ["3.0.0:2.7.0", "3.1.0", true],
+    ["3.0.0:2.7.0", "3.1.3", true],
   ]
 else
   [
     # Build xruby versions prior ruby2_keywords in parallel using ruby-2.5
     ["2.6.0:2.5.0:2.4.0", "2.5.9", false],
     # Build xruby versions with ruby2_keywords in parallel using ruby-3.x
-    ["3.1.0:3.0.0:2.7.0", "3.1.0", true],
+    ["3.2.0:3.1.0:3.0.0:2.7.0", "3.1.3", true],
   ]
 end
 
@@ -190,16 +159,17 @@ ENV XRUBIES <%= xrubies %>
 # Build xruby versions in parallel
 # Then cleanup all build artifacts
 RUN bash -c " \
-    rvm use <%= rvm %> && \
-    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 CC=#{target}-clang &&" if platform =~ /darwin/ %> \
-    export MAKE='make V=1 <%= "-j`nproc`" if parallel %>' && \
-    rake-compiler cross-ruby VERSION=$XRUBIES HOST=<%= target %> && \
-    rm -rf ~/.rake-compiler/builds ~/.rake-compiler/sources && \
-    find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw "
+      rvm use <%= rvm %> && \
+      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 CC=#{target}-clang &&" if platform =~ /darwin/ %> \
+      export MAKE='make V=1 <%= "-j`nproc`" if parallel %>' && \
+      rake-compiler cross-ruby VERSION=$XRUBIES HOST=<%= target %> && \
+      rm -rf ~/.rake-compiler/builds ~/.rake-compiler/sources && \
+      find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw \
+    "
 <% end %>
 
 <% if platform=~/linux/ %>
@@ -217,15 +187,26 @@ RUN find /usr/local/rake-compiler/ruby/*mingw*/ -name rbconfig.rb | while read f
 # 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 *msvcrt-ruby*.dll.a | while read f ; do n=`echo $f | sed s/.dll//` ; mv $f $n ; done
+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/ %>
+# ruby-3.2 on darwin links with `-bundle_loader`, see https://github.com/rake-compiler/rake-compiler-dock/issues/87
+RUN find /usr/local/rake-compiler/ruby/*/*/lib/ruby/3.2.0 -name rbconfig.rb | \
+    while read f ; do sed -i 's/\["EXTDLDFLAGS"\] = "/&-Wl,-flat_namespace /' $f ; done
+<% end %>
+
+##
+##  Final adjustments
+##
 USER root
 
 # Fix paths in rake-compiler/config.yml
 RUN sed -i -- "s:/root/.rake-compiler:/usr/local/rake-compiler:g" /usr/local/rake-compiler/config.yml
 
-
 <% if platform=~/mingw/ %>
 # Install wrappers for strip commands as a workaround for "Protocol error" in boot2docker.
 COPY build/strip_wrapper /root/
@@ -246,9 +227,6 @@ RUN echo "export PATH=\$DEVTOOLSET_ROOTPATH/usr/bin:\$PATH" >> /etc/rubybashrc
 # Add prefixed versions of compiler tools
 RUN for f in addr2line gcc gcov-tool ranlib ar dwp gcc-ranlib nm readelf as elfedit gcc-ar gprof objcopy size c++filt g++ gcov ld objdump strings cpp gcc-nm pkg-config strip ; do ln -sf $DEVTOOLSET_ROOTPATH/usr/bin/$f $DEVTOOLSET_ROOTPATH/usr/bin/<%= target %>-$f ; done
 
-# 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
-
 # Use builtin functions of newer gcc to avoid linker issues on Musl based Linux
 COPY build/math_h.patch /root/
 RUN cd /usr/include/ && \
@@ -272,6 +250,11 @@ RUN echo "source /etc/profile.d/rcd-env.sh" >> /etc/rubybashrc
 # Install sudoers configuration
 COPY build/sudoers /etc/sudoers.d/rake-compiler-dock
 
-ENV RUBY_CC_VERSION 3.1.0:3.0.0:2.7.0:2.6.0:2.5.0:2.4.0
+RUN bash -c " \
+      rvm alias create default 3.1.3 && \
+      rvm use default \
+    "
+
+ENV RUBY_CC_VERSION 3.2.0:3.1.0:3.0.0:2.7.0:2.6.0:2.5.0:2.4.0
 
 CMD bash

data/History.md

@@ -1,3 +1,33 @@
+1.3.0 / 2022-01-11
+------------------
+
+* Add Ruby 3.2 cross-compilation support.
+* Update RVM installations to latest rubygems.
+* Update to rake-compiler 1.2.1.
+* Reduce pre-installed gems to only rake-compiler and bundler.
+* Install yaml and ffi development headers in the base images, for psych and ffi gem compilation.
+* Ensure autoconf is installed in the base iamges.
+* Bump JRuby to 9.4.0.0
+* Move docker images to ghcr.io/rake-compiler:
+  * `ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-jruby`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-aarch64-linux`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-arm-linux`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-arm64-darwin`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-x64-mingw-ucrt`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-x64-mingw32`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-x86-linux`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-x86-mingw32`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-x86_64-darwin`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-x86_64-linux`
+* Start publishing weekly image snapshots.
+
+
+1.2.2 / 2022-06-27
+------------------
+
+* Fix ucrt libruby file naming for static build. #69
+
+
 1.2.1 / 2022-03-17
 ------------------
 

data/README.md

@@ -95,51 +95,6 @@ For Linux:
 You can also choose between different executable ruby versions by `rvm use <version>` .
 The current default is 3.1.
 
-
-### As a CI System Container
-
-The OCI images provided by rake-compiler-dock can be used without the `rake-compiler-dock` gem or wrapper. This may be useful if your CI pipeline is building native gems.
-
-For example, a Github Actions job might look like this:
-
-``` yaml
-jobs:
-  native-gem:
-    name: "native-gem"
-    runs-on: ubuntu-latest
-    container:
-      image: "larskanis/rake-compiler-dock-mri-x86_64-linux:1.2.1"
-    steps:
-      - uses: actions/checkout@v2
-      - run: bundle install && bundle exec rake gem:x86_64-linux:rcd
-      - uses: actions/upload-artifact@v2
-        with:
-          name: native-gem
-          path: gems
-          retention-days: 1
-```
-
-Where the referenced rake task might be defined by:
-
-``` ruby
-cross_platforms = ["x64-mingw32", "x86_64-linux", "x86_64-darwin", "arm64-darwin"]
-
-namespace "gem" do
-  cross_platforms.each do |platform|
-    namespace platform do
-      task "rcd" do
-        Rake::Task["native:#{platform}"].invoke
-        Rake::Task["pkg/#{rcee_precompiled_spec.full_name}-#{Gem::Platform.new(platform)}.gem"].invoke
-      end
-    end
-  end
-end
-
-```
-
-For an example of rake tasks that support this style of invocation, visit https://github.com/flavorjones/ruby-c-extensions-explained/tree/main/precompiled
-
-
 ### JRuby support
 
 Rake-compiler-dock offers a dedicated docker image for JRuby.
@@ -220,6 +175,58 @@ gem 'rake-compiler-dock', '~> 1.2'
 
 See [the wiki](https://github.com/rake-compiler/rake-compiler-dock/wiki/Projects-using-rake-compiler-dock) for projects which make use of rake-compiler-dock.
 
+### As a CI System Container
+
+The OCI images provided by rake-compiler-dock can be used without the `rake-compiler-dock` gem or wrapper. This may be useful if your CI pipeline is building native gems.
+
+For example, a Github Actions job might look like this:
+
+``` yaml
+jobs:
+  native-gem:
+    name: "native-gem"
+    runs-on: ubuntu-latest
+    container:
+      image: "ghcr.io/rake-compiler/rake-compiler-dock-image:1.2.2-mri-x86_64-linux"
+    steps:
+      - uses: actions/checkout@v2
+      - run: bundle install && bundle exec rake gem:x86_64-linux:rcd
+      - uses: actions/upload-artifact@v2
+        with:
+          name: native-gem
+          path: gems
+          retention-days: 1
+```
+
+Where the referenced rake task might be defined by:
+
+``` ruby
+cross_platforms = ["x64-mingw32", "x86_64-linux", "x86_64-darwin", "arm64-darwin"]
+
+namespace "gem" do
+  cross_platforms.each do |platform|
+    namespace platform do
+      task "rcd" do
+        Rake::Task["native:#{platform}"].invoke
+        Rake::Task["pkg/#{rcee_precompiled_spec.full_name}-#{Gem::Platform.new(platform)}.gem"].invoke
+      end
+    end
+  end
+end
+
+```
+
+For an example of rake tasks that support this style of invocation, visit https://github.com/flavorjones/ruby-c-extensions-explained/tree/main/precompiled
+
+
+### Living on the edge: using weekly snapshots
+
+OCI images snapshotted from `master` are published weekly to Github Container Registry with the string "snapshot" in place of the version number in the tag name, e.g.:
+
+- `ghcr.io/rake-compiler/rake-compiler-dock-image:snapshot-mri-x86_64-linux`
+
+These images are intended for integration testing. They may not work properly and should not be considered production ready.
+
 
 ## Environment Variables
 
@@ -233,7 +240,7 @@ The following variables are recognized by rake-compiler-dock:
     Must be a space separated list out of `x86-mingw32`, `x64-mingw-ucrt`, `x64-mingw32`, `x86-linux`, `x86_64-linux`, `arm-linux`, `aarch64-linux`, `x86_64-darwin` and `arm64-darwin`.
     It is ignored when `rubyvm` is set to `:jruby`.
 * `RCD_IMAGE` - The docker image that is downloaded and started.
-    Defaults to "larskanis/rake-compiler-dock:IMAGE_VERSION" with an image version that is determined by the gem version.
+    Defaults to "ghcr.io/rake-compiler/rake-compiler-dock-image:IMAGE_VERSION-PLATFORM" with an image version that is determined by the gem version.
 
 The following variables are passed through to the docker container without modification:
 

data/Rakefile

@@ -6,9 +6,6 @@ require_relative "build/parallel_docker_build"
 
 RakeCompilerDock::GemHelper.install_tasks
 
-DOCKERHUB_USER = ENV['DOCKERHUB_USER'] || "larskanis"
-docker_build_cmd = Shellwords.split(ENV['RCD_DOCKER_BUILD'] || "docker build")
-
 platforms = [
   ["x86-mingw32", "i686-w64-mingw32"],
   ["x64-mingw32", "x86_64-w64-mingw32"],
@@ -29,7 +26,8 @@ namespace :build do
     desc "Build image for platform #{platform}"
     task platform => sdf
     task sdf do
-      sh(*docker_build_cmd, "-t", "#{DOCKERHUB_USER}/rake-compiler-dock-mri-#{platform}:#{RakeCompilerDock::IMAGE_VERSION}", "-f", "Dockerfile.mri.#{platform}", ".")
+      image_name = RakeCompilerDock::Starter.container_image_name(platform: platform)
+      sh(*RakeCompilerDock.docker_build_cmd(platform), "-t", image_name, "-f", "Dockerfile.mri.#{platform}", ".")
     end
 
     df = ERB.new(File.read("Dockerfile.mri.erb"), trim_mode: ">").result(binding)
@@ -40,16 +38,25 @@ namespace :build do
   desc "Build image for JRuby"
   task :jruby => "Dockerfile.jruby"
   task "Dockerfile.jruby" do
-    sh(*docker_build_cmd, "-t", "#{DOCKERHUB_USER}/rake-compiler-dock-jruby:#{RakeCompilerDock::IMAGE_VERSION}", "-f", "Dockerfile.jruby", ".")
+    image_name = RakeCompilerDock::Starter.container_image_name(rubyvm: "jruby")
+    sh(*RakeCompilerDock.docker_build_cmd("jruby"), "-t", image_name, "-f", "Dockerfile.jruby", ".")
   end
 
-  RakeCompilerDock::ParallelDockerBuild.new(platforms.map{|pl, _| "Dockerfile.mri.#{pl}" } + ["Dockerfile.jruby"], workdir: "tmp/docker", docker_build_cmd: docker_build_cmd)
+  RakeCompilerDock::ParallelDockerBuild.new(platforms.map{|pl, _| "Dockerfile.mri.#{pl}" } + ["Dockerfile.jruby"], workdir: "tmp/docker")
 
   desc "Build images for all MRI platforms in parallel"
-  multitask :mri => platforms.map(&:first)
+  if ENV['RCD_USE_BUILDX_CACHE']
+    task :mri => platforms.map(&:first)
+  else
+    multitask :mri => platforms.map(&:first)
+  end
 
   desc "Build images for all platforms in parallel"
-  multitask :all => platforms.map(&:first) + ["jruby"]
+  if ENV['RCD_USE_BUILDX_CACHE']
+    task :all => platforms.map(&:first) + ["jruby"]
+  else
+    multitask :all => platforms.map(&:first) + ["jruby"]
+  end
 end
 
 task :build => "build:all"
@@ -57,14 +64,14 @@ task :build => "build:all"
 namespace :prepare do
   desc "Build cross compiler for x64-mingw-ucrt aka RubyInstaller-3.1+"
   task "mingw64-ucrt" do
-    sh(*docker_build_cmd, "-t", "#{DOCKERHUB_USER}/mingw64-ucrt:20.04", ".",
+    sh(*RakeCompilerDock.docker_build_cmd, "-t", "larskanis/mingw64-ucrt:20.04", ".",
        chdir: "mingw64-ucrt")
   end
 end
 
 desc "Run tests"
 task :test do
-  sh "ruby -w -W2 -I. -Ilib -e \"#{Dir["test/test_*.rb"].map{|f| "require '#{f}';"}.join}\" -- -v"
+  sh %Q{ruby -w -W2 -I. -Ilib -e "#{Dir["test/test_*.rb"].map{|f| "require '#{f}';"}.join}" -- -v #{ENV['TESTOPTS']}}
 end
 
 desc "Update predefined_user_group.rb"
@@ -92,12 +99,12 @@ end
 namespace :release do
   desc "push all docker images"
   task :images do
-    jimg = "#{DOCKERHUB_USER}/rake-compiler-dock-jruby:#{RakeCompilerDock::IMAGE_VERSION}"
-    sh "docker", "push", jimg
+    image_name = RakeCompilerDock::Starter.container_image_name(rubyvm: "jruby")
+    sh("docker", "push", image_name)
 
     platforms.each do |platform, _|
-      img = "#{DOCKERHUB_USER}/rake-compiler-dock-mri-#{platform}:#{RakeCompilerDock::IMAGE_VERSION}"
-      sh "docker", "push", img
+      image_name = RakeCompilerDock::Starter.container_image_name(platform: platform)
+      sh("docker", "push", image_name)
     end
   end
 end

data/build/mk_i686.rb

@@ -1,3 +1,5 @@
+#! /usr/bin/env ruby
+
 require "fileutils"
 
 Dir["/usr/bin/x86_64-linux-gnu-*"].each do |file|

data/build/mk_osxcross.sh

@@ -0,0 +1,38 @@
+#! /usr/bin/env bash
+
+set -o errexit
+set -o pipefail
+set -x
+
+git clone -q --depth=1 https://github.com/tpoechtrager/osxcross.git /opt/osxcross
+rm -rf /opt/osxcross/.git
+
+set +x
+cd /opt/osxcross/tarballs
+set -x
+curl -L -o MacOSX11.1.sdk.tar.xz https://github.com/larskanis/MacOSX-SDKs/releases/download/11.1/MacOSX11.1.sdk.tar.xz
+tar -xf MacOSX11.1.sdk.tar.xz -C .
+cp -rf /usr/lib/llvm-10/include/c++ MacOSX11.1.sdk/usr/include/c++
+cp -rf /usr/include/x86_64-linux-gnu/c++/9/bits/ MacOSX11.1.sdk/usr/include/c++/v1/bits
+tar -cJf MacOSX11.1.sdk.tar.xz MacOSX11.1.sdk
+
+set +x
+cd /opt/osxcross
+set -x
+UNATTENDED=1 SDK_VERSION=11.1 OSX_VERSION_MIN=10.13 USE_CLANG_AS=1 ./build.sh
+ln -s /usr/bin/llvm-config-10 /usr/bin/llvm-config
+ENABLE_COMPILER_RT_INSTALL=1 SDK_VERSION=11.1 ./build_compiler_rt.sh
+rm -rf *~ build tarballs/*
+
+echo "export PATH=/opt/osxcross/target/bin:\$PATH" >> /etc/rubybashrc
+echo "export MACOSX_DEPLOYMENT_TARGET=10.13" >> /etc/rubybashrc
+echo "export OSXCROSS_MP_INC=1" >> /etc/rubybashrc
+
+# Add links to build tools without target version kind of:
+#   arm64-apple-darwin-clang   =>   arm64-apple-darwin20.1-clang
+rm -f /opt/osxcross/target/bin/*-apple-darwin-*
+find /opt/osxcross/target/bin/ -name '*-apple-darwin[0-9]*' | sort | while read f ; do d=`echo $f | sed s/darwin[0-9\.]*/darwin/`; echo $f '"$@"' | tee $d && chmod +x $d ; done
+
+# There's no objdump in osxcross but we can use llvm's
+ln -s /usr/lib/llvm-10/bin/llvm-objdump /opt/osxcross/target/bin/x86_64-apple-darwin-objdump
+ln -s /usr/lib/llvm-10/bin/llvm-objdump /opt/osxcross/target/bin/aarch64-apple-darwin-objdump

data/build/parallel_docker_build.rb

@@ -2,15 +2,28 @@ require "fileutils"
 require "rake"
 
 module RakeCompilerDock
+  class << self
+    def docker_build_cmd(platform=nil)
+      cmd = if ENV['RCD_USE_BUILDX_CACHE']
+        if platform
+          cache_version = RakeCompilerDock::IMAGE_VERSION.split(".").take(2).join(".")
+          cache = File.join("cache", cache_version, platform)
+          "docker buildx build --cache-to=type=local,dest=#{cache},mode=max --cache-from=type=local,src=#{cache} --load"
+        else
+          return nil
+        end
+      else
+        ENV['RCD_DOCKER_BUILD'] || "docker build"
+      end
+      Shellwords.split(cmd)
+    end
+  end
+
   # Run docker builds in parallel, but ensure that common docker layers are reused
   class ParallelDockerBuild
     include Rake::DSL
 
-    attr_reader :docker_build_cmd
-
-    def initialize(dockerfiles, workdir: "tmp/docker", inputdir: ".", task_prefix: "common-",
-                   docker_build_cmd: %w["docker", "build"])
-      @docker_build_cmd = docker_build_cmd
+    def initialize(dockerfiles, workdir: "tmp/docker", inputdir: ".", task_prefix: "common-")
       FileUtils.mkdir_p(workdir)
 
       files = parse_dockerfiles(dockerfiles, inputdir)
@@ -100,7 +113,9 @@ module RakeCompilerDock
     #
     # The layers will be reused in subsequent builds, even if they run in parallel.
     def docker_build(filename, workdir)
-      sh(*docker_build_cmd, "-f", File.join(workdir, filename), ".")
+      cmd = RakeCompilerDock.docker_build_cmd
+      return if cmd.nil?
+      sh(*RakeCompilerDock.docker_build_cmd, "-f", File.join(workdir, filename), ".")
     end
   end
 end

data/build/patches2/rake-compiler-1.2.1/0005-make-miniruby.patch

@@ -0,0 +1,19 @@
+fix(temp): rake-compiler explicitly builds miniruby first
+
+See https://bugs.ruby-lang.org/issues/19239 for the upstream bug
+report.
+
+TODO: This patch can be removed if that's fixed in a 3.2.0 final release.
+
+diff --git a/tasks/bin/cross-ruby.rake b/tasks/bin/cross-ruby.rake
+index 8317a2a..d9bfe4c 100644
+--- a/tasks/bin/cross-ruby.rake
++++ b/tasks/bin/cross-ruby.rake
+@@ -129,6 +129,7 @@
+ 
+     # make
+     file "#{build_dir}/ruby.exe" => ["#{build_dir}/Makefile"] do |t|
++      sh "#{MAKE} miniruby", chdir: File.dirname(t.prerequisites.first)
+       sh MAKE, chdir: File.dirname(t.prerequisites.first)
+     end
+