Stop bundling unnecessary host runtime into container images

Author: yugui

ruby/private/BUILD.host_runtime.tpl

@@ -14,6 +14,7 @@ ruby_toolchain(
         "-I$(RUNFILES_DIR)/org_ruby_lang_ruby_host/bundler/lib",
     ],
     runtime = "//:runtime",
+    is_host = True,
     rules_ruby_workspace = "{rules_ruby_workspace}",
     # TODO(yugui) Extract platform info from RbConfig
     # exec_compatible_with = [],

ruby/private/binary.bzl

@@ -29,11 +29,18 @@ def _ruby_binary_impl(ctx):
             "main",
         )
 
+    if sdk.is_host:
+        interpreter_file_deps = []
+        interpreter_trans_deps = []
+    else:
+        interpreter_file_deps = [interpreter]
+        interpreter_trans_deps = [sdk.interpreter]
+
     executable = ctx.actions.declare_file(ctx.attr.name)
     deps = _transitive_deps(
         ctx,
-        extra_files = [interpreter, executable],
-        extra_deps = [sdk.interpreter],
+        extra_files = interpreter_file_deps + [executable],
+        extra_deps = interpreter_trans_deps,
     )
 
     rubyopt = reversed(deps.rubyopt.to_list())

ruby/private/host_runtime.bzl

@@ -52,12 +52,6 @@ def _install_host_ruby(ctx, ruby):
         },
     )
 
-    # Install lib
-    paths, rel_paths = _list_libdirs(ruby)
-    for i, (path, rel_path) in enumerate(zip(paths, rel_paths)):
-        if not _is_subpath(rel_path, rel_paths[:i]):
-            ctx.symlink(path, rel_path)
-
     # Install libruby
     static_library = ruby.expand_rbconfig(ruby, "${libdir}/${LIBRUBY_A}")
     if ctx.path(static_library).exists:
@@ -73,7 +67,6 @@ def _install_host_ruby(ctx, ruby):
 
     return struct(
         includedirs = _install_dirs(ctx, ruby, "rubyarchhdrdir", "rubyhdrdir"),
-        libdirs = rel_paths,
         static_library = _relativate(static_library),
         shared_library = _relativate(shared_library),
     )
@@ -104,8 +97,6 @@ def _ruby_host_runtime_impl(ctx):
         "BUILD.bazel",
         ctx.attr._buildfile_template,
         substitutions = {
-            "{ruby_path}": repr(ruby.rel_interpreter_path),
-            "{ruby_basename}": repr(ruby.interpreter_name),
             "{includes}": repr(installed.includedirs),
             "{hdrs}": repr(["%s/**/*.h" % path for path in installed.includedirs]),
             "{static_library}": repr(installed.static_library),

ruby/private/toolchain.bzl

@@ -7,6 +7,7 @@ RubyRuntimeInfo = provider(
         "bundler": "A label which points bundler command",
         "runtime": "A list of labels which points runtime libraries",
         "rubyopt": "A list of strings which should be passed to the interpreter as command line options",
+        "is_host": "True only if the runtime is the host ruby ",
     },
 )
 
@@ -17,6 +18,7 @@ def _ruby_toolchain_impl(ctx):
             bundler = ctx.attr.bundler,
             runtime = ctx.files.runtime,
             rubyopt = ctx.attr.rubyopt,
+            is_host = ctx.attr.is_host,
         ),
     )]
 
@@ -43,6 +45,7 @@ _ruby_toolchain = rule(
         "rubyopt": attr.string_list(
             default = [],
         ),
+        "is_host": attr.bool(default = False),
     },
 )
 
@@ -52,15 +55,17 @@ def ruby_toolchain(
         bundler,
         runtime,
         rubyopt = [],
+        is_host = False,
         rules_ruby_workspace = RULES_RUBY_WORKSPACE_NAME,
         **kwargs):
     impl_name = name + "_sdk"
     _ruby_toolchain(
         name = impl_name,
         interpreter = interpreter,
         bundler = bundler,
-        rubyopt = rubyopt,
         runtime = runtime,
+        rubyopt = rubyopt,
+        is_host = is_host,
     )
 
     native.toolchain(