rb_sys 0.9.73 → 0.9.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8bb642f25924e3bb8dcb3bae758454c97677214bba4cbbf50f9d093771597d2
-  data.tar.gz: 6d6350f41a64a1a49ce1b7de2d01a026934784d7b60f86d1d8c5942ef94f5b81
+  metadata.gz: 0fb182f0d955fbe703d6436ef738dd013dc95c1c2f9ee934399d055485707810
+  data.tar.gz: 993df78ba76f8eae5e800c929e3da60ca33542fed394866c77f370903f027bf0
 SHA512:
-  metadata.gz: 91cd4dbe340a9e63900827f49b7705d2cebbf327743f5d9d3e55e35994b565c346a3176decabbfbc84461e0eba4e1714813618cb018ac961eed911fa4466999c
-  data.tar.gz: 90ea14d43c369dbef087b144475b1d9660e8ab4579a3779aca06e622f385d9f463f6fe3136741a2b51f9616c3232e8929e858da97e58dcffaa432fd2263c360c
+  metadata.gz: 8e9256f3815b03c444621825e231639b7832fa37cd5f8c035b3e0377c5e20670dbc397a01d0cd6a926c0408d83f6f40a7120de78f949ff85c896d0ba2d97a119
+  data.tar.gz: 62fdd0ee8f62a52eeda57e74a91ff17d9ba811b81190571c1fe2a81dd16fc18304f6e700ab5ba0301a9f54e558454dadc165898a28b65bf2c65805ab82f09dff

data/exe/rb-sys-dock

@@ -181,6 +181,10 @@ def docker_tmp
   @docker_tmp ||= "/tmp/rb-sys-dock"
 end
 
+def docker_bundle_home
+  @docker_bundle_home ||= "/tmp/rb-sys-dock/bundle-home"
+end
+
 def cache_dir
   return @cache_dir if defined?(@cache_dir)
 
@@ -255,6 +259,18 @@ def mount_bundle_cache
   "#{volume(dir, bundle_path)} -e BUNDLE_PATH=#{bundle_path.inspect}"
 end
 
+def mount_bundle_config
+  bundle_config = File.join(ENV["HOME"] || "~", ".bundle", "config")
+
+  return unless File.exist?(bundle_config)
+
+  logger.trace("Mounting bundle config: #{bundle_config}")
+  parts = []
+  parts << volume(bundle_config, File.join(docker_bundle_home, ".bundle", "config"), mode: "ro")
+  parts << "-e BUNDLE_HOME=#{docker_bundle_home.inspect}"
+  parts.join(" ")
+end
+
 def tmp_target_dir
   return @tmp_target_dir if defined?(@tmp_target_dir)
 
@@ -293,10 +309,13 @@ def default_command_to_run(input_args)
 end
 
 def uid_gid
-  if /darwin/.match?(RbConfig::CONFIG["host_os"])
-    ["1000", "1000"]
+  explicit_uid = ENV["RB_SYS_DOCK_UID"]
+  explicit_gid = ENV["RB_SYS_DOCK_GID"]
+
+  if /darwin/.match?(RbConfig::CONFIG["host_os"]) && !default_docker_command.include?("podman")
+    [explicit_uid || "1000", explicit_gid || "1000"]
   else
-    [Process.uid, Process.gid]
+    [explicit_uid || Process.uid, explicit_gid || Process.gid]
   end
 end
 
@@ -346,6 +365,7 @@ def rcd(input_args)
       #{mount_cargo_registry} \
       #{mount_rustup_toolchains} \
       #{mount_bundle_cache} \
+      #{mount_bundle_config} \
       #{mount_command_history} \
       #{user_mapping} \
       -e GEM_PRIVATE_KEY_PASSPHRASE \

data/lib/rb_sys/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RbSys
-  VERSION = "0.9.73"
+  VERSION = "0.9.74"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.73
+  version: 0.9.74
 platform: ruby
 authors:
 - Ian Ker-Seymer
@@ -30,7 +30,7 @@ cert_chain:
   DIZ6NVmpBvohJVCCCDxQQxFKLXZp1ivoxjN+m7eJSW7yzIz062pH4u8pPNQsiVSb
   I5rgRPbDr2rAFGXKoQ0+u6CLkRxqrVsITl/OPfZhBQI=
   -----END CERTIFICATE-----
-date: 2023-04-21 00:00:00.000000000 Z
+date: 2023-04-22 00:00:00.000000000 Z
 dependencies: []
 description:
 email: