rbbt-image 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7138ef89baa52f6d13bd5f72140b5a6dcbba36b
-  data.tar.gz: 8ded0f2a9d48bb91da685af3aecf49e7d55422c4
+  metadata.gz: 2f2b171f1bf5d33e7943f98071ae139ddcbda3c4
+  data.tar.gz: 7b87e701e36fbb39245dd2348e9f30f847677505
 SHA512:
-  metadata.gz: 35fb2d664acbc7c8d93f68c0f3b139ff623d8b56d1a5b18e02d9ffb84e74d6d4d014e62b23efcc30c6b0ea1d44d83d20984f60c89495e4165733c3e14723aa92
-  data.tar.gz: c6f7504c49416ee3ab66810082987446ad8eb4fc140efb8a6c99e1d94d8e36228453c1580fefc1d67e78aeda8f86fb8f6f59fdc1739780dd4151494507f54ce3
+  metadata.gz: 7d9e957806da59454ea69adb49ca59e9ab684f42f7eb1ad2bc5fe3c4bf03ba2dc661239bc9fb7180d14c87ee8cc7e63e3593c5f25f88640f20f1108bc7252001
+  data.tar.gz: 867c87a6749369707391e30db5352d8f70ffceb378e14594418e42711cf6f3b8fb9f19553425335760f87dbc6f9f3aa593bbf7b720e14782d21db45d3ba10812

data/bin/run_rbbt_docker.rb

@@ -12,12 +12,17 @@ Runs a docker image from an infrastructure definition file
 
 $ #{ $0 } [<options>] <infrastructure.yaml> <command> <args> [-- <extra docker options>]
 
-Infrastruture definition comes in YAML. 
+Infrastruture definition comes in YAML. Note that the options listed here will
+be consumed and thus not passed to the container command, with the exception of
+'--log' which applies to both. To get help from the container command use '-ch'
+or '--chelp' which will append the '--help' options to the container command.
+The other options have been named to avoid clashes.
 
 -h--help Print this help
---log* Log level
--d--dry_run Dry run
--n--name* Container name
+-ch--chelp Print help on the container command 
+--log* Log level (both this command and the container command)
+--docker_dry_run Dry run. Just output docker command line
+--container_name* Container name
 --extra_mounts* Extra mounts separated by ','
 EOF
 
@@ -53,6 +58,10 @@ while args.any? and args[0] != '--'
   cmd_args << args.shift
 end
 
+if options[:chelp]
+  cmd_args << '--help'
+end
+
 docker_args = args[1..-1] || []
 
 if not File.exists? infrastructure_file

data/lib/rbbt/docker.rb

@@ -3,6 +3,7 @@ module RbbtDocker
     cmd_args.collect!{|a| '"' << a << '"' }
     docker_args.collect!{|a| '"' << a << '"' }
 
+
     IndiferentHash.setup(infrastructure)
 
     image = infrastructure[:image]
@@ -54,12 +55,18 @@ module RbbtDocker
     name_conf = options[:name]
     name_conf = "--name " << name_conf if name_conf
     name_conf ||= ""
-    cmd_str = "docker run #{name_conf} #{mount_conf} #{user_conf} #{docker_args.select{|arg| arg != '"--"'}*" "} #{image} /bin/bash --login -c '#{umask}#{cmd} #{cmd_args*" "}"
-    cmd_str += " --log #{Log.severity} " if cmd =~  /\brbbt$/
-    cmd_str += "'" 
 
-    Log.debug "Docker: \n\n" << cmd_str << "\n\n"
+    container_command = "#{umask}#{cmd} #{cmd_args*" "}"
+    container_command += " --log #{Log.severity} " if cmd =~  /\brbbt$/
+
+    cmd_str = "docker run #{name_conf} #{mount_conf} #{user_conf} #{(docker_args - ["--"])*" "} #{Log.color(:green, image)} /bin/bash --login -c '#{Log.color :green, container_command}'"
+
+    if options[:docker_dry_run]
+      puts Log.color(:magenta, "#Docker CMD:") <<  "\n" << cmd_str << "\n"
+    else
+      Log.debug Log.color(:magenta, "#Docker CMD:") <<  "\n" << cmd_str << "\n\n"
+    end
 
-    exec(cmd_str) unless options[:dry_run]
+    exec(Log.uncolor(cmd_str)) unless options[:docker_dry_run]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-image
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbbt-util