docker-utils 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 949791671cf03716ddfea9b3cd86cdf7696b1d23
-  data.tar.gz: 7d8059a7d640e29d3c48f3b9ce499db7c646c8f1
+  metadata.gz: 97c7d006aca2a033ffb9faa2accfd60578262b56
+  data.tar.gz: c9bea903272bb78f1b2ec843c44f4aa10b0322a1
 SHA512:
-  metadata.gz: d30a2645107d619d692751e6bc81bb7f74fea0820ea42c4cae8050ce910d24751be8c7deca2d6e3834b36926f87f46af400aa33beb8625aa9a1bfd843bcec042
-  data.tar.gz: 3970e56ec02d7bf0b022074bf855105544b7cc5197600963d7b1a1ee2f5de205bbd21072f60280dfcd87a46faaa11f90dff2f9c57b4c1fd97f806661cf26a27c
+  metadata.gz: 8a42ebc7ac7af8e76f9b9c68f76d4173112864b0437aff7837590f8d4efb99f88186ff88a1fbcca3131c4581960f9462b5451c784e9df888b6e24a5661918d83
+  data.tar.gz: 4fe3978cb087011f06fd8c453ade72287d65d66f0556a2887d0bf3a130e6aa7fe6400f496c46fef811aa0a6fe05e419c9a6f133b0b6eb1208a30a753ddc25d8a

data/.git/COMMIT_EDITMSG

@@ -1 +1 @@
-Remove TMPDIR from guest
+toolchain -b binds network to host

data/.git/logs/HEAD

@@ -6,3 +6,4 @@ be1f197731085b21d3f3be9029bee5b582171590 279ea12cb6a2e318bdd44687c8ed53d2c1adc0a
 1104c618b07e441604244128f06b4bf92afb3725 fb1f9c856ce0b46016dbc6ad59dadb42d4c8a440 Levi Aul <levi@leviaul.com> 1403404049 -0700	commit: Fix self-referential scripts
 fb1f9c856ce0b46016dbc6ad59dadb42d4c8a440 34fe88f616ebfbe01e26bca750f2723feea23426 Levi Aul <levi@leviaul.com> 1403727351 -0700	commit: Correct location of unbound data volumes on host
 34fe88f616ebfbe01e26bca750f2723feea23426 4746d16d9f9cefee5d7a11db1834cedce8400c59 Levi Aul <levi@leviaul.com> 1403746668 -0700	commit: Remove TMPDIR from guest
+4746d16d9f9cefee5d7a11db1834cedce8400c59 327a4895eaf4b6a7e33fb4b023e5fa6474d9e354 Levi Aul <levi@leviaul.com> 1403817004 -0700	commit: toolchain -b binds network to host

data/.git/logs/refs/heads/master

@@ -6,3 +6,4 @@ be1f197731085b21d3f3be9029bee5b582171590 279ea12cb6a2e318bdd44687c8ed53d2c1adc0a
 1104c618b07e441604244128f06b4bf92afb3725 fb1f9c856ce0b46016dbc6ad59dadb42d4c8a440 Levi Aul <levi@leviaul.com> 1403404049 -0700	commit: Fix self-referential scripts
 fb1f9c856ce0b46016dbc6ad59dadb42d4c8a440 34fe88f616ebfbe01e26bca750f2723feea23426 Levi Aul <levi@leviaul.com> 1403727351 -0700	commit: Correct location of unbound data volumes on host
 34fe88f616ebfbe01e26bca750f2723feea23426 4746d16d9f9cefee5d7a11db1834cedce8400c59 Levi Aul <levi@leviaul.com> 1403746668 -0700	commit: Remove TMPDIR from guest
+4746d16d9f9cefee5d7a11db1834cedce8400c59 327a4895eaf4b6a7e33fb4b023e5fa6474d9e354 Levi Aul <levi@leviaul.com> 1403817004 -0700	commit: toolchain -b binds network to host

data/.git/logs/refs/remotes/origin/master

@@ -5,3 +5,4 @@ be1f197731085b21d3f3be9029bee5b582171590 279ea12cb6a2e318bdd44687c8ed53d2c1adc0a
 6ffac4880de276b0f60e3633cacb482b18d0f906 1104c618b07e441604244128f06b4bf92afb3725 Levi Aul <levi@leviaul.com> 1403395587 -0700	update by push
 1104c618b07e441604244128f06b4bf92afb3725 fb1f9c856ce0b46016dbc6ad59dadb42d4c8a440 Levi Aul <levi@leviaul.com> 1403404051 -0700	update by push
 fb1f9c856ce0b46016dbc6ad59dadb42d4c8a440 4746d16d9f9cefee5d7a11db1834cedce8400c59 Levi Aul <levi@leviaul.com> 1403746675 -0700	update by push
+4746d16d9f9cefee5d7a11db1834cedce8400c59 327a4895eaf4b6a7e33fb4b023e5fa6474d9e354 Levi Aul <levi@leviaul.com> 1403817010 -0700	update by push

data/.git/objects/32/7a4895eaf4b6a7e33fb4b023e5fa6474d9e354

@@ -0,0 +1 @@
+x
��]j�0���S�Rvc�B(�{.!���Զ��N�_�}�o�``���p‡�"���D�-��q�>_2'r����h~�.��

data/.git/refs/heads/master

@@ -1 +1 @@
-4746d16d9f9cefee5d7a11db1834cedce8400c59
+327a4895eaf4b6a7e33fb4b023e5fa6474d9e354

data/.git/refs/remotes/origin/master

@@ -1 +1 @@
-4746d16d9f9cefee5d7a11db1834cedce8400c59
+327a4895eaf4b6a7e33fb4b023e5fa6474d9e354

data/.git/refs/tags/0.1.8

@@ -0,0 +1 @@
+327a4895eaf4b6a7e33fb4b023e5fa6474d9e354

data/share/scripts/toolchain

@@ -1,47 +1,79 @@
 #!/usr/bin/env ruby
 
-toolchain_image = 'bexio/toolchain:latest'
-toolchain_subcommand_args = ARGV
+EXPUNGE_ENV_KEYS = [
+  'TMPDIR'
+]
 
+require 'optparse'
 require 'pathname'
 
-host_repo_root = `git rev-parse --show-toplevel 2>/dev/null`.chomp
-if host_repo_root.empty?
-  $stderr.puts "docker toolchain only operates inside a git repository"
-  Kernel.exit 1
+options = {}
+options[:toolchain_image] = 'bexio/toolchain:latest'
+
+toolchain_docker_args = []
+toolchain_subcommand_args = ARGV[0..-1]
+ARGV.clear
+
+if subcommand_delim_pos = toolchain_subcommand_args.index('--')
+  toolchain_own_args, toolchain_subcommand_args = toolchain_subcommand_args.partition.each_with_index{ |x, i| i <= subcommand_delim_pos }
+  ARGV.concat(toolchain_own_args[0..-2])
 end
 
-host_repo_root = Pathname.new(host_repo_root)
-host_cwd = Pathname.pwd
+OptionParser.new do |opts|
+  opts.on("-i", "--image", "Run within the specified toolchain image") do |image_name|
+    options[:toolchain_image] = image_name
+  end
 
-rel_cwd = host_cwd.relative_path_from(host_repo_root)
+  opts.on("-b", "--[no-]bind-net", "Run the command in the host's network namespace") do |v|
+    options[:bind_net] = v
+  end
+end.parse!
 
-guest_repo_root = Pathname.new('/app')
-guest_cwd = guest_repo_root + rel_cwd
+toolchain_image = (options[:toolchain_image].split(':') + ['latest'])[0, 2].join(':')
 
 toolchain_available = system 'docker', 'inspect', '-f', '{{.Id}}', toolchain_image, out: '/dev/null', err: '/dev/null'
-unless toolchain_available
-  system 'docker', 'pull', toolchain_image
+unless toolchain_available or system('docker', 'pull', toolchain_image)
+  $stderr.puts "could not locate toolchain image '#{toolchain_image}'; aborting"
+  Kernel.exit 1
 end
 
-expunge_env_keys = [
-  'TMPDIR'
-]
 
-host_env_keys = ENV.keys
+
+# mount options
+host_cwd = Pathname.pwd
+host_repo_root = `git rev-parse --show-toplevel 2>/dev/null`.chomp
+host_repo_root = nil if host_repo_root.empty?
+if host_repo_root
+  host_repo_root = Pathname.new(host_repo_root)
+  rel_cwd = host_cwd.relative_path_from(host_repo_root)
+  guest_repo_root = Pathname.new('/src')
+  guest_cwd = guest_repo_root + rel_cwd
+
+  toolchain_docker_args.concat([
+    '-v', "#{host_repo_root}:#{guest_repo_root}",
+    '-w', guest_cwd.to_s
+  ])
+end
+
+# interactivity options
+if $stdin.tty? and $stdout.tty?
+  toolchain_docker_args.concat(['-i', '-t'])
+end
+
+# environment options
+exposed_env_keys = ENV.keys - EXPUNGE_ENV_KEYS
 container_env_keys = `docker inspect -f '{{.Config.Env}}' #{toolchain_image}`.chomp[1..-2].split(' ').map{ |pair| pair.split('=').first }
+toolchain_docker_args.concat((exposed_env_keys - container_env_keys).map{ |k| ['-e', k] }.flatten)
 
-share_env_keys = host_env_keys - container_env_keys - expunge_env_keys
-share_env_args = share_env_keys.map{ |k| ['-e', k] }.flatten
+# network options
+if options[:bind_net]
+  toolchain_docker_args.push '--net=host'
+end
 
 
-interaction_args = ($stdin.tty? && $stdout.tty?) ? ['-i', '-t'] : []
 
 docker_bin_path = `which docker`.chomp
 Kernel.exec docker_bin_path, 'run', '--rm',
-  *interaction_args,
-  '-v', "#{host_repo_root}:#{guest_repo_root}",
-  '-w', guest_cwd.to_s,
-  *share_env_args,
+  *toolchain_docker_args,
   toolchain_image,
   *toolchain_subcommand_args

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-utils
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Levi Aul
@@ -63,6 +63,7 @@ files:
 - "./.git/objects/2b/a58bc75cacb00054a89b55f9c29b14b6ad9fc9"
 - "./.git/objects/31/5a20c22de5072f43f347ed4c3edfd558d3437a"
 - "./.git/objects/32/38418ccf635978b113b90861fade4ed12ca3f7"
+- "./.git/objects/32/7a4895eaf4b6a7e33fb4b023e5fa6474d9e354"
 - "./.git/objects/32/9508e363b1ff534ddffe810d2da961396f3dc1"
 - "./.git/objects/34/fe88f616ebfbe01e26bca750f2723feea23426"
 - "./.git/objects/3a/2b538cabc17e77f8cb0dd6de8b16605ef58737"
@@ -74,9 +75,12 @@ files:
 - "./.git/objects/54/5333ccc0f292151680a511e14cbe64a03221e1"
 - "./.git/objects/59/8547f6e792f8b7d4f1f62239f04c525acacef1"
 - "./.git/objects/61/71d3bbd3622dfc60faac202c1b90a3c7f9791f"
+- "./.git/objects/62/bdd27536599feb1102bd00ce990d0cd9db2764"
+- "./.git/objects/66/e68fd3387763fe419ae3635d2e6e26f798f27f"
 - "./.git/objects/6c/b1af9864154ad45be7590a38f809306a077ece"
 - "./.git/objects/6f/fac4880de276b0f60e3633cacb482b18d0f906"
 - "./.git/objects/7c/8448991c45ca29d577a67b9631997d0d1b812c"
+- "./.git/objects/80/c3604b85a4058a0f405d6976bac915d1c15680"
 - "./.git/objects/86/9331fa05276fd1d1f1d74f8b7191ed27acf6e7"
 - "./.git/objects/97/0cfb60e9f0afbfd3396cb5751bb902e50552ca"
 - "./.git/objects/9e/21ba32b039906aeb275160496bf8bba0dbd97f"
@@ -97,6 +101,7 @@ files:
 - "./.git/objects/db/3da375f32f0dea97f64ddaf7546ebba1d6f205"
 - "./.git/objects/dc/ceeaf814610ebba30b42d39c7d19e581e6d33d"
 - "./.git/objects/e7/69b6ea29eb14ba6ea173c62c282388ae59b876"
+- "./.git/objects/ea/d1738ae012a657ae2a2d91ccdf321cd2ac7943"
 - "./.git/objects/eb/8c9934c1edbbb9d2d7b70f48e5b4ad2ce4125f"
 - "./.git/objects/f0/cf031748908ac06c5212eb4442175fed69965d"
 - "./.git/objects/f0/cf648547f6239a7881022a31b5215ef724e6c5"
@@ -116,6 +121,7 @@ files:
 - "./.git/refs/tags/0.1.5"
 - "./.git/refs/tags/0.1.6"
 - "./.git/refs/tags/0.1.7"
+- "./.git/refs/tags/0.1.8"
 - "./.gitignore"
 - "./Rakefile"
 - "./bin/docker-utils"