[GR-16742] Update Docker testing for the separate native-image installable.

PullRequest: truffleruby/915

Author: chrisseaton

doc/contributor/docker.md

@@ -30,9 +30,9 @@ $ jt docker print --fedora28 --source --rvm
 Or, to run a full set of tests on a set of new release candidate tarballs:
 
 ```bash
-$ jt docker test --graalvm graalvm-ce.tar.gz ruby-installable.jar --test release_branch
-$ jt docker test --graalvm graalvm-ee.tar.gz ruby-installable.jar --test release_branch
-$ jt docker test --graalvm graalvm-ee.tar.gz ruby-installable.jar --rebuild-images --test release_branch
+$ jt docker test --graalvm graalvm-ce.tar.gz ruby-installable-ce.jar --test release_branch
+$ jt docker test --graalvm graalvm-ee.tar.gz ruby-installable-ee.jar --test release_branch
+$ jt docker test --graalvm graalvm-ee.tar.gz ruby-installable-ee.jar --rebuild-images native-image-installable-ee.jar --test release_branch
 $ jt docker test --standalone truffleruby-linux-amd64.tar.gz --test release_branch
 ```
 
@@ -74,7 +74,7 @@ Pick any of:
 ## Other options
 
 * Print the Dockerfile rather than building it, `print` instead of `build`
-* Rebuild images after installing the Ruby component, `--rebuild-images`
+* Rebuild `polyglot` and `libpolyglot` images after installing the Ruby component, `--rebuild-images`
 * Run a full set of Docker tests we care about, `test` instead of `build`
 * Use a custom TruffleRuby repo, `--repo url`
 * Do not rebuild `openssl`, to test error messages, `--no-rebuild-openssl`

doc/user/installing-graalvm.md

@@ -56,19 +56,15 @@ You can also download the Ruby component (`ruby-installable-...`) manually from
 https://github.com/oracle/truffleruby/releases. Then install it with
 `gu install --file path/to/ruby-installable-...`.
 
-If you install Ruby into the Enterprise Edition of GraalVM, you should then
-rebuild the Ruby executable images using the runtime from the Enterprise
-Edition. The version of the Ruby executable images you install by default uses
-the Community Edition runtime until you rebuild.
+If you are installing Ruby into GraalVM EE then you need to download the Ruby
+EE installable from OTN and install using `--file` in the same way.
 
-To get the best performance you want to rebuild the images. Check that `ruby
---version` reports that you are running `GraalVM EE` rather than `GraalVM CE`.
-
-Rebuilding the executable images can take a few minutes and you should have
-about 8 GB of RAM available.
+After installing Ruby you may want to rebuild other images so that they can
+use the new language. Rebuilding the executable images can take a few minutes
+and you should have about 10 GB of RAM available.
 
 ```bash
-$ gu rebuild-images ruby
+$ gu rebuild-images polyglot libpolyglot
 ```
 
 ## Using a Ruby package manager

tool/jt.rb

@@ -2078,6 +2078,7 @@ def dockerfile(*args)
         source_branch = args.shift
       when '--rebuild-images'
         rebuild_images = true
+        native_component = args.shift
       when '--no-rebuild-openssl'
         rebuild_openssl = false
       when '--no-manager'
@@ -2199,7 +2200,11 @@ def dockerfile(*args)
 
     if rebuild_images
       if [:public, :graalvm].include?(install_method)
-        lines.push "RUN #{graalvm_base}/bin/gu rebuild-images ruby"
+        FileUtils.copy native_component, docker_dir
+        native_component = File.basename(native_component)
+        lines.push "COPY #{native_component} /test/"
+        lines.push "RUN #{graalvm_bin}/gu install --file /test/#{native_component} | tee install.log"
+        lines.push "RUN #{graalvm_base}/bin/gu rebuild-images polyglot libpolyglot"
       else
         abort "can't rebuild images for a build not from public or from local GraalVM components"
       end