rake-compiler-dock 0.7.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4f1c79ba29d38c727c275cac167a4c8515677da374fedf15f5cadf6683cdd32
-  data.tar.gz: f38bd41996e31d3ab825f642ce5906187dd240d50e80c4245eb6896876ca15b8
+  metadata.gz: 7bbe8d21de2a30484e2ec2d877bf6e2e2538c7f02d207e924716d9bb99609fbf
+  data.tar.gz: 2069a049a2a9974a98f13bfd704f60f8e07dc5741f2e0f5d18a6c4f122358875
 SHA512:
-  metadata.gz: bb4677877ad29fbc0c14a9d0455fe22016bd6af64081d170b3556f0c6f1e7ba14b7bc7144fc59f70c0ac0cde44200016150929aa3120bf963d817f7af5d223ff
-  data.tar.gz: c7cd83788dbdd56cec416c0736243fd6bc937420f22edd9183b1d365c5cd5e464022fd9b6ad341c15c479fdd371b237debaa1a65c6ec5d6c7d7546827650d4d3
+  metadata.gz: 197abac03aa2262d6893e4f79dcb9fa63bbf7018afa70d6ea7c189abc390074a36c7892b6745e8399ffbe4309686b5310c382d5227dfe9906d6bd875a561b5af
+  data.tar.gz: 184393bac4b1890e1c19567c7c80ecc3a015e78e8789232c4f00a28d7c2a6ba0209ae94e9c1ffa2dcbd58bcd9eb8a1875732c32263cdbd47499437bc0e3617aa

data/.gitignore

@@ -1,5 +1,9 @@
 /.bundle/
 /.yardoc
+/Dockerfile.mri.x86-linux
+/Dockerfile.mri.x86-mingw32
+/Dockerfile.mri.x86_64-linux
+/Dockerfile.mri.x64-mingw32
 /Gemfile.lock
 /_yardoc/
 /coverage/

data/Dockerfile.jruby

@@ -1,16 +1,20 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 RUN apt-get -y update && \
-    apt-get install -y curl git-core xz-utils wget unzip sudo gpg dirmngr openjdk-11-jdk-headless
+    apt-get install -y curl git-core xz-utils wget unzip sudo gpg dirmngr openjdk-14-jdk-headless && \
+    rm -rf /var/lib/apt/lists/*
 
 # Add "rvm" as system group, to avoid conflicts with host GIDs typically starting with 1000
 RUN groupadd -r rvm && useradd -r -g rvm -G sudo -p "" --create-home rvm && \
     echo "source /etc/profile.d/rvm.sh" >> /etc/rubybashrc
 USER rvm
 
+RUN mkdir ~/.gnupg && \
+    echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf
+
 # install rvm, RVM 1.26.0+ has signed releases, source rvm for usage outside of package scripts
-RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB && \
-    (curl -L http://get.rvm.io | sudo bash -s stable) && \
+RUN gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB && \
+    (curl -L http://get.rvm.io | sudo bash) && \
     bash -c " \
         source /etc/rubybashrc && \
         rvmsudo rvm cleanup all "
@@ -22,7 +26,7 @@ ENV BASH_ENV /etc/rubybashrc
 # install rubies and fix permissions on
 RUN bash -c " \
     export CFLAGS='-s -O3 -fno-fast-math -fPIC' && \
-    for v in jruby-9.2.5.0 ; do \
+    for v in jruby-9.2.14.0 ; do \
         rvm install --binary \$v --patch \$(echo ~/patches/ruby-\$v/* | tr ' ' ','); \
     done && \
     rvm cleanup all && \
@@ -32,7 +36,7 @@ RUN bash -c " \
 # do not generate documentation for gems
 RUN echo "gem: --no-ri --no-rdoc" >> ~/.gemrc && \
     bash -c " \
-        rvm all do gem install --no-document bundler rake-compiler hoe rubygems-tasks && \
+        rvm all do gem install --no-document bundler 'bundler:~>1.16' rake-compiler hoe rubygems-tasks && \
         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
@@ -42,8 +46,8 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
 
 USER root
 
-RUN bash -c "rvm alias create default jruby-9.2.5.0"
-RUN echo "rvm use jruby-9.2.5.0 > /dev/null" >> /etc/rubybashrc
+RUN bash -c "rvm alias create default jruby-9.2.14.0"
+RUN echo "rvm use jruby-9.2.14.0 > /dev/null" >> /etc/rubybashrc
 
 # Add rvm to the global bashrc
 RUN echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc

data/Dockerfile.mri.erb

@@ -0,0 +1,231 @@
+FROM <%=
+  case platform
+    when /x86_64-linux/ then "quay.io/pypa/manylinux2014_x86_64"
+    when /x86-linux/ then "quay.io/pypa/manylinux2014_i686"
+    else "ubuntu:20.04"
+  end %>
+
+<% if platform=~/linux/ %>
+# 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
+
+# Prepare sudo and delete sudo as alias to gosu
+RUN rm -f /usr/local/bin/sudo && \
+    groupadd -r sudo && \
+    echo "%sudo  ALL=(ALL)       ALL" >> /etc/sudoers
+<% 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 && \
+    rm -rf /var/lib/apt/lists/*
+<% end %>
+
+# Add "rvm" as system group, to avoid conflicts with host GIDs typically starting with 1000
+RUN groupadd -r rvm && useradd -r -g rvm -G sudo -p "" --create-home rvm
+
+# Make sure rvm and later settings are available in interactive and non-interactive shells
+RUN echo "source /etc/profile.d/rvm.sh" >> /etc/rubybashrc && \
+    echo "source /etc/rubybashrc" >> /etc/bashrc && \
+    echo "source /etc/rubybashrc" >> /etc/bash.bashrc
+ENV BASH_ENV /etc/rubybashrc
+
+USER rvm
+
+RUN mkdir ~/.gnupg && \
+    chmod 700 ~/.gnupg && \
+    echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf
+
+# install rvm, RVM 1.26.0+ has signed releases, source rvm for usage outside of package scripts
+RUN gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB && \
+    (curl -L http://get.rvm.io | sudo bash) && \
+    bash -c " \
+        source /etc/rubybashrc && \
+        rvm autolibs disable && \
+        rvmsudo rvm cleanup all "
+
+# Import patch files for ruby and gems
+COPY build/patches /home/rvm/patches/
+
+# install rubies and fix permissions on
+ENV RVM_RUBIES 2.5.8 3.0.0
+RUN bash -c " \
+    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.1' 'hoe:3.20.0' mini_portile rubygems-tasks mini_portile2 && \
+        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
+USER root
+
+<% if platform !~ /linux/ %>
+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=~/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 %>
+
+RUN bash -c " \
+        rvm alias create default 2.5.8 && \
+        rvm use default "
+
+<% if platform=~/linux/   %>
+# Create dev tools x86-linux-*
+COPY build/mk_i686.rb /root/
+RUN bash -c " \
+        ruby /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 && \
+    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
+
+<% end %>
+
+# Patch rake-compiler to build and install static libraries for Linux rubies
+USER rvm
+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.1 && \
+      echo applying patches to ruby-\$v /home/rvm/patches/rake-compiler-1.1.1/*.patch && \
+      ( git apply /home/rvm/patches/rake-compiler-1.1.1/*.patch || true ) && \
+      cd /usr/local/rvm/gems/ruby-\$v/gems/hoe-3.20.0 && \
+      echo applying patches to ruby-\$v /home/rvm/patches/hoe-3.20.0/*.patch && \
+      ( git apply /home/rvm/patches/hoe-3.20.0/*.patch || true ) \
+    done "
+
+# Patch rubies for cross build
+USER root
+RUN bash -c " \
+    for v in 2.7.0 3.0.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
+
+
+ENV XRUBIES 3.0.0:2.7.0:2.6.0:2.5.0:2.4.0:2.3.0
+
+<% strip = '-s' if platform !~ /darwin/ %>
+# Build all xruby versions in parallel
+# Then cleanup all build artifacts
+RUN bash -c " \
+    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' && \
+    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 "
+
+<% if platform=~/linux/ %>
+# Avoid linking against libruby shared object.
+# See also https://github.com/rake-compiler/rake-compiler-dock/issues/13
+RUN find /usr/local/rake-compiler/ruby/*linux*/ -name libruby.so | xargs rm
+RUN find /usr/local/rake-compiler/ruby/*linux*/ -name libruby-static.a | while read f ; do cp $f `echo $f | sed s/-static//` ; done
+RUN find /usr/local/rake-compiler/ruby/*linux*/ -name libruby.a | while read f ; do ar t $f | xargs ar d $f ; done
+RUN find /usr/local/rake-compiler/ruby/*linux*/ -name mkmf.rb | while read f ; do sed -i ':a;N;$!ba;s/TRY_LINK = [^\n]*\n[^\n]*\n[^\n]*LOCAL_LIBS)/& -lruby-static/' $f ; done
+<% end %>
+
+<% 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 *msvcrt-ruby*.dll.a | while read f ; do n=`echo $f | sed s/.dll//` ; mv $f $n ; done
+<% end %>
+
+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/
+RUN mv /usr/bin/<%= target %>-strip /usr/bin/<%= target %>-strip.bin && \
+    ln /root/strip_wrapper /usr/bin/<%= target %>-strip
+
+# Use posix pthread for mingw so that C++ standard library for thread could be
+# available such as std::thread, std::mutex, so on.
+# https://sourceware.org/pthreads-win32/
+RUN printf "1\n" | update-alternatives --config <%= target %>-gcc && \
+    printf "1\n" | update-alternatives --config <%= target %>-g++
+<% end %>
+
+<% if platform=~/linux/ %>
+# Enable modern compiler toolset of manylinux image
+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
+<% end %>
+
+<% if platform=~/arm64-darwin/ %>
+# Add a arm64 darwin target as alternative to aarch64
+RUN grep -E 'rbconfig-aarch64-darwin' /usr/local/rake-compiler/config.yml | sed 's/rbconfig-[a-z0-9_]*-darwin/rbconfig-<%= platform %>/' >> /usr/local/rake-compiler/config.yml
+<% end %>
+
+# Install SIGINT forwarder
+COPY build/sigfw.c /root/
+RUN gcc $HOME/sigfw.c -o /usr/bin/sigfw
+
+# Install user mapper
+COPY build/runas /usr/bin/
+
+# Install sudoers configuration
+COPY build/sudoers /etc/sudoers.d/rake-compiler-dock
+
+ENV RUBY_CC_VERSION 3.0.0:2.7.0:2.6.0:2.5.0:2.4.0:2.3.0
+
+CMD bash

data/History.md

@@ -1,3 +1,59 @@
+1.1.0 / 2020-12-28
+------------------
+
+* Use ManyLinux2014 as docker base image for linux targets.
+  That way compatibility to very old linux dists can be provided, while still using modern compilers.
+* Add macOS cross build targets "x86_64-darwin" and "arm64-darwin".
+  They are based on MacOSX-SDK-11.1
+* Add Ruby-3.0 as native rvm and cross ruby version.
+* Remove Ruby-2.2 from RUBY_CC_VERSION and cross rubies.
+* Update to Ubuntu-20.04 for Mingw and JRuby targets.
+* Set `ExtensionTask#no_native=true` to fix issues with cross_compiling callback not being called.
+  See discussion here: https://github.com/rake-compiler/rake-compiler/pull/171
+* Allow setting an alternative dockerhub user per `DOCKERHUB_USER`.
+
+
+1.0.1 / 2020-01-13
+------------------
+
+* Fix error when using rake-compiler-dock on non-tty STDIN. #31
+
+
+1.0.0 / 2020-01-04
+------------------
+* Add ruby-2.7.0 cross ruby.
+* Use per-target docker images.
+  There are currently 5 docker images:
+  * larskanis/rake-compiler-dock-mri-x86-mingw32
+  * larskanis/rake-compiler-dock-mri-x64-mingw32
+  * larskanis/rake-compiler-dock-mri-x86-linux
+  * larskanis/rake-compiler-dock-mri-x86_64-linux
+  * larskanis/rake-compiler-dock-jruby
+
+  Since every image has only the taget specific compilers and rubies, care has to be taken, that only rake tasks are triggered, that belong to the specific target.
+  See the README.md for more information.
+* Ensure the separate docker images always use as much as possible common docker images layers to avoid increased download sizes.
+* Pass GEM_PRIVATE_KEY_PASSPHRASE to the container.
+* Update JRuby to 9.2.9.0 and native CRuby to 2.5.7.
+* Create empty ~/.gem to be used for gem signing key.
+* Ensure terminal is in cooked mode after build.
+  This fixes terminal misconfiguration after parallel builds.
+* Raise Windows-API to Vista (affects ruby < 2.6 only)
+* Use posix pthread for mingw so that C++ standard library for thread could be available such as std::thread, std::mutex, so on.
+* Make the system to have GLIBC 2.12 instead of 2.23 so that generated ruby package can run on CentOS 6 with GLIBC 2.12
+
+
+0.7.2 / 2019-03-18
+------------------
+* Fix missing libruby.a of cross rubies. Fixes #26
+* Downgrade to Ubuntu-16.04 for MRI base image. Fixes #25
+
+
+0.7.1 / 2019-01-27
+------------------
+* Add bundler-2.x to image and keep bundler-1.x for compatibility with projects using a `Gemfile.lock` generated by bundler-1.x .
+
+
 0.7.0 / 2018-12-26
 ------------------
 * Add docker image for JRuby extensions, new option `:rubyvm` and `RCD_RUBYVM` environment variable

data/README.md

@@ -1,10 +1,10 @@
 # rake-compiler-dock
 
-**Easy to use and reliable cross compiler environment for building Windows and Linux binary gems.**
+**Easy to use and reliable cross compiler environment for building Windows, Linux and JRuby binary gems.**
 
-It provides cross compilers and Ruby environments for 2.0 and newer versions of the [RubyInstaller](http://rubyinstaller.org/) and Linux runtime environments.
+It provides cross compilers and Ruby environments for 2.2 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-extentions](https://github.com/rake-compiler/rake-compiler-dock/wiki/Projects-using-rake-compiler-dock).
+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).
 
 This is kind of successor of [rake-compiler-dev-box](https://github.com/tjschuck/rake-compiler-dev-box).
 It is wrapped as a gem for easier setup, usage and integration and is based on lightweight Docker containers.
@@ -16,7 +16,7 @@ Install docker natively on Linux:
 
     $ sudo apt-get install docker.io
 
-... or install [docker-toolbox for Windows and OSX](https://www.docker.com/docker-toolbox) or boot2docker on [Windows](https://github.com/boot2docker/windows-installer/releases) or [OS X](https://github.com/boot2docker/osx-installer/releases) .
+... or install [docker-toolbox for Windows and OSX](https://github.com/docker/toolbox/releases) or boot2docker on [Windows](https://github.com/boot2docker/windows-installer/releases) or [OS X](https://github.com/boot2docker/osx-installer/releases) .
 
 Install rake-compiler-dock as a gem. The docker image is downloaded later on demand:
 
@@ -30,20 +30,23 @@ Install rake-compiler-dock as a gem. The docker image is downloaded later on dem
 
 ## Usage
 
-Rake-compiler-dock provides the necessary tools to build Ruby extensions for Windows and Linux written in C and C++.
+Rake-compiler-dock provides the necessary tools to build Ruby extensions for Windows and Linux written in C and C++ and JRuby written in Java.
 It is intended to be used in conjunction with [rake-compiler's](https://github.com/rake-compiler/rake-compiler) cross build capability.
 Your Rakefile should enable cross compilation like so:
 
-    Rake::ExtensionTask.new('my_extension', my_gem_spec) do |ext|
+    exttask = Rake::ExtensionTask.new('my_extension', my_gem_spec) do |ext|
       ext.cross_compile = true
       ext.cross_platform = %w[x86-mingw32 x64-mingw32 x86-linux x86_64-linux]
     end
 
-It may also be used to build ffi based binary gems like [libusb](https://github.com/larskanis/libusb), but currently doesn't provide any additional build helpers for this use case, beyond docker invocation and cross compilers.
+See below, how to invoke cross builds in your Rakefile.
+
+Additionally it may also be used to build ffi based binary gems like [libusb](https://github.com/larskanis/libusb), but currently doesn't provide any additional build helpers for this use case, beyond docker invocation and cross compilers.
 
 ### Interactive Usage
 
 Rake-compiler-dock offers the shell command `rake-compiler-dock` and a [ruby API](http://www.rubydoc.info/gems/rake-compiler-dock/RakeCompilerDock) for issuing commands within the docker image, described below.
+There dedicated are images for `x86-mingw32`, `x64-mingw32`, `x86-linux`, `x86_64-linux` and `jruby` targets.
 
 `rake-compiler-dock` without arguments starts an interactive shell session.
 This is best suited to try out and debug a build.
@@ -55,16 +58,22 @@ But note, that all other changes to the file system of the container are dropped
 All commands are executed with the same user and group of the host.
 This is done by copying user account data into the container and sudo to it.
 
-To build x86 and x64 Windows and Linux binary gems interactively, it can be called like this:
+To build x86 Windows and x86_64 Linux binary gems interactively, it can be called like this:
 
     user@host:$ cd your-gem-dir/
-    user@host:$ rake-compiler-dock   # this enters a container with an interactive shell
+    user@host:$ rake-compiler-dock   # this enters a container with an interactive shell for x86 Windows (default)
     user@5b53794ada92:$ bundle
     user@5b53794ada92:$ rake cross native gem
     user@5b53794ada92:$ exit
     user@host:$ ls pkg/*.gem
-    your-gem-1.0.0.gem  your-gem-1.0.0-x64-mingw32.gem  your-gem-1.0.0-x86-mingw32.gem
-    your-gem-1.0.0-x86_64-linux.gem  your-gem-1.0.0-x86-linux.gem
+    your-gem-1.0.0.gem  your-gem-1.0.0-x86-mingw32.gem
+
+    user@host:$ RCD_PLATFORM=x86_64-linux rake-compiler-dock   # this enters a container for amd64 Linux target
+    user@adc55b2b92a9:$ bundle
+    user@adc55b2b92a9:$ rake cross native gem
+    user@adc55b2b92a9:$ exit
+    user@host:$ ls pkg/*.gem
+    your-gem-1.0.0.gem  your-gem-1.0.0-x86_64-linux.gem
 
 Or non-interactive:
 
@@ -78,23 +87,79 @@ This is local to the running session, only:
     sudo apt-get update && sudo apt-get install your-package
 
 You can also choose between different executable ruby versions by `rvm use <version>` .
-The current default is 2.3.
+The current default is 2.5.
+
+### JRuby support
 
+Rake-compiler-dock offers a dedicated docker image for JRuby.
+JRuby doesn't need a complicated cross build environment like C-ruby, but using Rake-compiler-dock for JRuby makes building binary gems more consistent.
+
+To build java binary gems interactively, it can be called like this:
+
+    user@host:$ cd your-gem-dir/
+    user@host:$ RCD_RUBYVM=jruby rake-compiler-dock   # this enters a container with an interactive shell
+    user@5b53794ada92:$ ruby -v
+    jruby 9.2.5.0 (2.5.0) 2018-12-06 6d5a228 OpenJDK 64-Bit Server VM 10.0.2+13-Ubuntu-1ubuntu0.18.04.4 on 10.0.2+13-Ubuntu-1ubuntu0.18.04.4 +jit [linux-x86_64]
+    user@5b53794ada92:$ bundle
+    user@5b53794ada92:$ rake java gem
+    user@5b53794ada92:$ exit
+    user@host:$ ls pkg/*.gem
+    your-gem-1.0.0.gem  your-gem-1.0.0-java.gem
 
 ### Add to your Rakefile
 
-To make the build process reproduceable for other parties, it is recommended to add rake-compiler-dock to your Rakefile.
+To make the build process reproducible for other parties, it is recommended to add rake-compiler-dock to your Rakefile.
 This can be done like this:
 
     task 'gem:native' do
       require 'rake_compiler_dock'
       sh "bundle package"   # Avoid repeated downloads of gems by using gem files from the host.
-      RakeCompilerDock.sh "bundle --local && rake cross native gem"
+      %w[ x86-mingw32 x64-mingw32 x86-linux x86_64-linux ].each do |plat|
+        RakeCompilerDock.sh "bundle --local && rake native:#{plat} gem", platform: plat
+      end
+      RakeCompilerDock.sh "bundle --local && rake java gem", rubyvm: :jruby
     end
 
+This runs the `bundle` and `rake` commands once for each platform.
+That is once for the jruby gems and 4 times for the specified MRI platforms.
+
+### Run builds in parallel
+
+rake-compiler-dock uses dedicated docker images per build target (since rake-compiler-dock-1.0).
+Because each target runs in a separate docker container, it is simple to run all targets in parallel.
+The following example defines `rake gem:native` as a multitask and separates the preparation which should run only once.
+It also shows how gem signing can be done with parallel builds.
+Please note, that parallel builds only work reliable, if the specific platform gem is requested (instead of just "rake gem").
+
+```ruby
+  namespace "gem" do
+    exttask.cross_platform.each do |plat|
+      desc "Build the native binary gems"
+      multitask 'native' => plat
+
+      task 'prepare' do
+        require 'rake_compiler_dock'
+        sh "cp ~/.gem/gem-*.pem build/gem/ || true"
+        require 'io/console'
+        ENV["GEM_PRIVATE_KEY_PASSPHRASE"] = STDIN.getpass("Enter passphrase of gem signature key: ")
+      end
+
+      task plat => 'prepare' do
+        RakeCompilerDock.sh <<-EOT, platform: plat
+          (cp build/gem/gem-*.pem ~/.gem/ || true) &&
+          bundle --local &&
+          rake native:#{plat} pkg/#{exttask.gem_spec.full_name}-#{plat}.gem
+        EOT
+      end
+    end
+  end
+```
+
+### Add to your Gemfile
+
 Rake-compiler-dock uses [semantic versioning](http://semver.org/), so you should add it into your Gemfile, to make sure, that future changes will not break your build.
 
-    gem 'rake-compiler-dock', '~> 0.6.0'
+    gem 'rake-compiler-dock', '~> 1.0'
 
 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.
 
@@ -105,12 +170,18 @@ Rake-compiler-dock makes use of several environment variables.
 
 The following variables are recognized by rake-compiler-dock:
 
+* `RCD_RUBYVM` - The ruby VM and toolchain to be used.
+    Must be one of `mri`, `jruby`.
+* `RCD_PLATFORM` - The target rubygems platform.
+    Must be a space separated list out of `x86-mingw32`, `x64-mingw32`, `x86-linux` and `x86_64-linux`.
+    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.
 
 The following variables are passed through to the docker container without modification:
 
 * `http_proxy`, `https_proxy`, `ftp_proxy` - See [Frequently asked questions](https://github.com/rake-compiler/rake-compiler-dock/wiki/FAQ) for more details.
+* `GEM_PRIVATE_KEY_PASSPHRASE` - To avoid interactive password prompts in the container.
 
 The following variables are provided to the running docker container: