conjur-debify 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cfd1a8c7590e68df545ee14205ebc86a695f636
-  data.tar.gz: 8951e64bfe8ab43dada0ed964bf0b1985679a73a
+  metadata.gz: 7c57a4e9688bb87a40ad356edb08469a8090ab22
+  data.tar.gz: 9ef86713510df115a32bc972117d7f46a9b1c5cc
 SHA512:
-  metadata.gz: 2c3c5de841eb1a8e14666da2f02a623d85ced3a2a72e99bc5d5fb4eb2bced96e38415c59ac42d2105aa81b20c45af4fb063825293f7ffd46811d465727409e14
-  data.tar.gz: 36ae0244afe85132741d13e867d477ed43a83bee52faf27ca439ec2f02fdadc369536fcbdf10bce1ac8cef79726bbc0b55787f1d6c78467497fe9f80c03d937f
+  metadata.gz: 8a189d86b8e9b4de1d5d3945f0ed77934cdfdeb8155cb3a3c87438b989368608090929ef5f8ad16caa38885b605c6e7439dfb2ac3bd56eefe4d7064ddf1aaf81
+  data.tar.gz: f7cc7725dbede77c5530d25da6ea8dd87ac7a95f3ed97e1092516a0a1ac8f933756de0034bd98664d272a9e66387b2c356cc6afbd1e0b6ae49723231eb4b77e4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.4.0
+
+* Add `--port` sandbox option
+
 # 1.3.1
 
 * When testing, `docker exec` into the Conjur container to run

data/lib/conjur/debify/version.rb

@@ -1,5 +1,5 @@
 module Conjur
   module Debify
-    VERSION = "1.3.1"
+    VERSION = "1.4.0"
   end
 end

data/lib/conjur/debify.rb

@@ -480,6 +480,9 @@ command "sandbox" do |c|
   c.desc "Specify volume for container"
   c.flag [ :'volumes-from' ], :multiple => true
 
+  c.desc "Expose a port from the container to host. Use <host>:<container>."
+  c.flag [ :p, :port ], :multiple => true
+
   c.desc 'Run dev-install in /src/<project-name>'
   c.default_value false
   c.switch [:'dev-install']
@@ -521,21 +524,33 @@ command "sandbox" do |c|
           "CONJUR_ENV=appliance",
           "CONJUR_AUTHN_API_KEY=secret",
           "CONJUR_ADMIN_PASSWORD=secret",
-        ] + global_options[:env],
-        'Binds' => [
-          [ File.expand_path(".ssh/id_rsa", ENV['HOME']), "/root/.ssh/id_rsa", 'ro' ].join(':'), 
-          [ dir, "/src/#{project_name}" ].join(':'),
-        ] + Array(cmd_options[:bind])
+        ] + global_options[:env]
       }
+
+      options['HostConfig'] = host_config = {}
+      host_config['Binds'] = [
+        [ File.expand_path(".ssh/id_rsa", ENV['HOME']), "/root/.ssh/id_rsa", 'ro' ].join(':'),
+        [ dir, "/src/#{project_name}" ].join(':'),
+      ] + Array(cmd_options[:bind])
+
       if global_options[:'local-bundle']
-        options['Binds']
+        host_config['Binds']
           .push([ vendor_dir, "/src/#{project_name}/vendor" ].join(':'))
           .push([ dot_bundle_dir, "/src/#{project_name}/.bundle" ].join(':'))
       end
 
-      options['Privileged'] = true if Docker.version['Version'] >= '1.10.0'
-      options['Links'] = cmd_options[:link] unless cmd_options[:link].empty?
-      options['VolumesFrom'] = cmd_options[:'volumes-from'] unless cmd_options[:'volumes-from'].empty?
+      host_config['Privileged'] = true if Docker.version['Version'] >= '1.10.0'
+      host_config['Links'] = cmd_options[:link] unless cmd_options[:link].empty?
+      host_config['VolumesFrom'] = cmd_options[:'volumes-from'] unless cmd_options[:'volumes-from'].empty?
+
+      unless cmd_options[:port].empty?
+        port_bindings = Hash.new({})
+        cmd_options[:port].each do |mapping|
+          hport, cport = mapping.split(':')
+          port_bindings["#{cport}/tcp"] = [{ 'HostPort' => hport }]
+        end
+        host_config['PortBindings'] = port_bindings
+      end
 
       if cmd_options[:kill]
         previous = Docker::Container.get(options['name']) rescue nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli