[GR-50715] Update dependencies and docker documentation

PullRequest: truffleruby/4183

Author: eregon

README.md

@@ -87,7 +87,7 @@ Runtime configurations are further detailed in [Deploying TruffleRuby](doc/user/
 TruffleRuby is actively tested on the following systems:
 
 * Oracle Linux 7, 8, 9
-* Ubuntu 16.04, 18.04, 20.04, 22.04 (all LTS)
+* Ubuntu 18.04, 20.04, 22.04 (all LTS)
 * Fedora 37, 38
 * Debian 10, 11, 12
 * macOS 11 (Big Sur)
@@ -102,7 +102,7 @@ environment, for example, by unmounting system filesystems such as `/dev/shm`.
 
 ## Dependencies
 
-* [make and gcc](doc/user/installing-llvm.md) for building C and C++ extensions
+* [make, gcc and g++](doc/user/installing-llvm.md) for building C and C++ extensions
 * [libssl](doc/user/installing-libssl.md) for the `openssl` C extension
 * [libyaml](doc/user/installing-libyaml.md) for the `psych` C extension
 * [zlib](doc/user/installing-zlib.md) for the `zlib` C extension

doc/contributor/docker.md

@@ -29,12 +29,12 @@ Then download the standalone's `.tar.gz` for linux-amd64 (looks like `ruby-stand
 The jdk version to use for the standalone is the one in `graal/vm/ce-release-artifacts.json`.
 The TruffleRuby commit in that build should correspond to the last commit of the release branch (`release/graal-vm/$VERSION`).
 
-We run all Docker tests, only on the standalone distribution to make it reasonably fast.
+We run all Docker tests on the standalone distributions.
 This can be done with:
 ```bash
 jt docker test --standalone $PATH_TO_STANDALONE_TAR_GZ --test release/graal-vm/$VERSION
 # A concrete example
-jt docker test --standalone $PWD/ruby-standalone-svm-java17-linux-amd64-*.tar.gz --test release/graal-vm/23.0
+jt docker test --standalone $PWD/ruby-native-standalone-svm-svmee-java22-linux-amd64-*.tar.gz --test release/graal-vm/23.0
 ```
 
 We typically run them in parallel instead to make it faster, running each of these commands in a different terminal:

doc/user/installing-llvm.md

@@ -12,15 +12,19 @@ The packages below are required to build C and C++ extensions.
 ### Fedora-based: RHEL, Oracle Linux, etc
 
 ```bash
-sudo dnf install make gcc
+sudo dnf install make gcc gcc-c++
 ```
 
+`gcc-c++` is only necessary for building C++ extensions.
+
 ### Debian-based: Ubuntu, etc
 
 ```bash
-sudo apt-get install make gcc
+sudo apt-get install make gcc g++
 ```
 
+`g++` is only necessary for building C++ extensions.
+
 ### macOS
 
 On macOS, make sure you have installed the command line developer tools from Xcode:

tool/docker-configs.yaml

@@ -5,6 +5,7 @@ rpm: &rpm
   openssl: openssl-devel
   yaml: libyaml-devel
   cext: gcc make
+  c++: gcc-c++
   set-locale:
     - ENV LANG=en_US.UTF-8
 
@@ -16,19 +17,21 @@ deb: &deb
   openssl: libssl-dev
   yaml: libyaml-dev
   cext: gcc make
+  c++: g++
   set-locale:
     # Uncomment the en_US.UTF-8 line in /etc/locale.gen
     - RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen
     # locale-gen generates locales for all uncommented locales in /etc/locale.gen
     - RUN locale-gen
     - ENV LANG=en_US.UTF-8
 
-ol7:
-  base: oraclelinux:7-slim
-  # --enablerepo needed for libyaml-devel
-  install: RUN yum install --enablerepo=ol7_optional_latest -y
-  locale:
-  <<: *rpm
+# Too old g++
+#ol7:
+#  base: oraclelinux:7-slim
+#  # --enablerepo needed for libyaml-devel
+#  install: RUN yum install --enablerepo=ol7_optional_latest -y
+#  locale:
+#  <<: *rpm
 
 ol8:
   base: oraclelinux:8-slim
@@ -56,11 +59,6 @@ fedora38:
   locale: glibc-langpack-en
   <<: *rpm
 
-ubuntu1604:
-  base: ubuntu:16.04
-  install: RUN apt-get update && apt-get install -y
-  <<: *deb
-
 ubuntu1804:
   base: ubuntu:18.04
   install: RUN apt-get update && apt-get install -y

tool/docker.rb

@@ -92,10 +92,6 @@ def docker(*args)
         case arg
         when *docker_distros
           distro_name = arg[2..-1]
-        when '--graalvm'
-          install_method = :graalvm
-          graalvm_tarball = args.shift
-          graalvm_components = args.shift.split(':').map { |path| File.expand_path(path) }
         when '--standalone'
           install_method = :standalone
           standalone_tarball = args.shift
@@ -129,6 +125,7 @@ def docker(*args)
       packages << distro.fetch('openssl')
       packages << distro.fetch('yaml')
       packages << distro.fetch('cext')
+      packages << distro.fetch('c++') if full_test
 
       proxy_vars = []
       # There is an issue with dnf + proxy in Fedora 34, install packages outside proxy to workaround
@@ -160,34 +157,7 @@ def docker(*args)
         Dir.mkdir docker_dir
       end
 
-      check_post_install_message = [
-          "RUN grep 'The Ruby openssl C extension needs to be recompiled on your system to work with the installed libssl' install.log",
-          "RUN grep '/languages/ruby/lib/truffle/post_install_hook.sh' install.log"
-      ]
-
       case install_method
-      when :graalvm
-        FileUtils.copy graalvm_tarball, docker_dir unless print_only
-        graalvm_tarball = File.basename(graalvm_tarball)
-        language_dir = graalvm_tarball.include?('java11') ? 'languages' : 'jre/languages'
-
-        lines << "COPY #{graalvm_tarball} /test/"
-        graalvm_base = '/test/graalvm'
-        lines << "RUN mkdir #{graalvm_base}"
-        lines << "RUN tar -zxf #{graalvm_tarball} -C #{graalvm_base} --strip-components=1"
-        graalvm_bin = "#{graalvm_base}/bin"
-
-        graalvm_components.each do |component|
-          FileUtils.copy component, docker_dir unless print_only
-          component = File.basename(component)
-          lines << "COPY #{component} /test/"
-          lines << "RUN #{graalvm_bin}/gu install --file /test/#{component} | tee -a install.log"
-        end
-        ruby_base = "#{graalvm_base}/#{language_dir}/ruby"
-        ruby_bin = graalvm_bin
-
-        lines.push(*check_post_install_message)
-        lines << "RUN #{ruby_base}/lib/truffle/post_install_hook.sh" if run_post_install_hook
       when :standalone
         FileUtils.copy standalone_tarball, docker_dir unless print_only
         standalone_tarball = File.basename(standalone_tarball)
@@ -222,29 +192,23 @@ def docker(*args)
 
       lines << "ENV PATH=#{ruby_bin}:$PATH"
 
-      configs = install_method == :graalvm ? %w[--native --jvm] : ['']
-
-      configs.each do |c|
-        lines << "RUN ruby #{c} --version"
-      end
+      lines << 'RUN ruby --version'
 
       if basic_test || full_test
-        configs.each do |c|
-          lines << "RUN cp -R #{ruby_base}/lib/gems /test/clean-gems"
+        lines << "RUN cp -R #{ruby_base}/lib/gems /test/clean-gems"
 
-          gem_install = "ruby #{c} -S gem install --no-document"
-          lines << "RUN #{gem_install} color"
-          lines << "RUN ruby #{c} -rcolor -e 'raise unless defined?(Color)'"
+        gem_install = 'ruby -S gem install --no-document'
+        lines << "RUN #{gem_install} color"
+        lines << "RUN ruby -rcolor -e 'raise unless defined?(Color)'"
 
-          lines << "RUN #{gem_install} oily_png"
-          lines << "RUN ruby #{c} -roily_png -e 'raise unless defined?(OilyPNG::Color)'"
+        lines << "RUN #{gem_install} oily_png"
+        lines << "RUN ruby -roily_png -e 'raise unless defined?(OilyPNG::Color)'"
 
-          lines << "RUN #{gem_install} unf"
-          lines << "RUN ruby #{c} -runf -e 'raise unless defined?(UNF)'"
+        lines << "RUN #{gem_install} unf"
+        lines << "RUN ruby -runf -e 'raise unless defined?(UNF)'"
 
-          lines << "RUN rm -rf #{ruby_base}/lib/gems"
-          lines << "RUN mv /test/clean-gems #{ruby_base}/lib/gems"
-        end
+        lines << "RUN rm -rf #{ruby_base}/lib/gems"
+        lines << "RUN mv /test/clean-gems #{ruby_base}/lib/gems"
       end
 
       if full_test
@@ -254,19 +218,14 @@ def docker(*args)
           lines << "COPY --chown=test #{file} #{file}"
         end
 
-        configs.each do |c|
-          excludes = %w[fails slow]
+        excludes = %w[fails slow]
 
-          %w[:command_line :security :language :core :tracepoint :library :capi :library_cext :truffle :truffle_capi].each do |set|
-            t_config = c.empty? ? '' : '-T' + c
-            t_excludes = excludes.map { |e| '--excl-tag ' + e }.join(' ')
-            lines << "RUN ruby spec/mspec/bin/mspec -t #{ruby_bin}/ruby #{t_config} #{t_excludes} #{set}"
-          end
+        %w[:command_line :security :language :core :tracepoint :library :capi :library_cext :truffle :truffle_capi].each do |set|
+          t_excludes = excludes.map { |e| '--excl-tag ' + e }.join(' ')
+          lines << "RUN ruby spec/mspec/bin/mspec -t #{ruby_bin}/ruby #{t_excludes} #{set}"
         end
 
-        configs.each do |c|
-          lines << "RUN ruby #{c} --experimental-options --engine.CompilationFailureAction=ExitVM --compiler.TreatPerformanceWarningsAsErrors=all --compiler.IterativePartialEscape  --engine.MultiTier=false pe/pe.rb || true"
-        end
+        lines << 'RUN ruby --experimental-options --engine.CompilationFailureAction=ExitVM --compiler.TreatPerformanceWarningsAsErrors=all --compiler.IterativePartialEscape  --engine.MultiTier=false pe/pe.rb || true'
       end
 
       lines << 'CMD bash'