kitchen-dokken 0.0.31 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d476d98405ea2e16c01d8b5222a404e8ce344c9
-  data.tar.gz: aa8acd58b318db0bb60bad95f9790ff37906d9fe
+  metadata.gz: 624899b08f3767c8e67ee162a4d80aa5eced1e3d
+  data.tar.gz: 186e7dcd5682fceefe9c29c2379623f992827eb3
 SHA512:
-  metadata.gz: be1714202042a22e154b96ad464ae026d0c14af254da5b68de13b9f27c55c039305563e80e3279fcf78338f5a74ec22cc86c0caa5f51359ab7287a60a4e20628
-  data.tar.gz: f94fc078e067c9ffceee7c058209563430f683c5565fecaf4c367fc3089415a5c1c0ee8c47a500fad425b26206867971522d3deabe24f13f3369cf7e05735b9b
+  metadata.gz: 6da44eaba2464e9d3f904dc8deef11ef956c885d99f1aa77bfea41bdfef790621da86f27f0c934effb0d06e92f410dc4b55683699b35bf998f082648da1d5521
+  data.tar.gz: cc554c47b56339cad2796e204408ae9c50631246c4a29ed9b310512e5a75bf959f1519c3c76eb9db85ca8885541e302cb64aa2398603da051eddf8fbb5706129

data/lib/kitchen/driver/dokken.rb

@@ -32,7 +32,6 @@ module Kitchen
     # @author Sean OMeara <sean@chef.io>
     class Dokken < Kitchen::Driver::Base
       default_config :pid_one_command, 'sh -c "trap exit 0 SIGTERM; while :; do sleep 1; done"'
-      default_config :privileged, false
       default_config :image_prefix, nil
       default_config :chef_version, '12.5.1'
       default_config :data_image, 'someara/kitchen-cache:latest'
@@ -40,6 +39,15 @@ module Kitchen
       default_config :read_timeout, 3600
       default_config :write_timeout, 3600
       default_config :api_retries, 20
+      # docker run args
+      default_config :privileged, false
+      default_config :hostname, nil
+      default_config :binds, nil # volumes to mount
+      default_config :links, nil
+      default_config :cap_add, nil
+      default_config :cap_drop, nil
+      default_config :security_opt, nil
+      default_config :network_mode, 'bridge'
 
       # (see Base#create)
       def create(state)
@@ -185,9 +193,16 @@ module Kitchen
           'name' => runner_container_name,
           'Cmd' => Shellwords.shellwords(config[:pid_one_command]),
           'Image' => "#{repo(work_image)}:#{tag(work_image)}",
+          'Hostname' => config[:hostname],
           'HostConfig' => {
             'Privileged' => config[:privileged],
-            'VolumesFrom' => [chef_container_name, data_container_name]
+            'VolumesFrom' => [chef_container_name, data_container_name],
+            'Binds' => Array(config[:binds]),
+            'Links' => Array(config[:links]),
+            'CapAdd' => Array(config[:cap_add]),
+            'CapDrop' => Array(config[:cap_drop]),
+            'SecurityOpt' => Array(config[:security_opt]),
+            'NetworkMode' => config[:network_mode],
           }
         )
         state[:runner_container] = runner_container.json

data/lib/kitchen/driver/dokken_version.rb

@@ -19,6 +19,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = '0.0.31'
+    DOKKEN_VERSION = '0.0.32'
   end
 end

data/lib/kitchen/transport/dokken.rb

@@ -41,6 +41,7 @@ module Kitchen
       default_config :docker_host_url, ENV['DOCKER_HOST'] || 'unix:///var/run/docker.sock'
       default_config :read_timeout, 3600
       default_config :write_timeout, 3600
+      default_config :host_ip_override, false
 
       # (see Base#connection)
       def connection(state, &block)
@@ -83,7 +84,10 @@ module Kitchen
         end
 
         def upload(locals, remote)
-          if options[:docker_host_url] =~ /unix:/
+          if options[:host_ip_override]
+            # Allow connecting to any ip/hostname to support sibling containers
+            ip = options[:host_ip_override]
+          elsif options[:docker_host_url] =~ /unix:/
             # we should read the proper mapped ip, since this allows us to upload the files
             ip = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostIp]
           elsif options[:docker_host_url] =~ /tcp:/
@@ -162,6 +166,7 @@ module Kitchen
       # @api private
       def connection_options(data) # rubocop:disable Metrics/MethodLength
         opts = {}
+        opts[:host_ip_override] = config[:host_ip_override]
         opts[:docker_host_url] = config[:docker_host_url]
         opts[:docker_host_options] = ::Docker.options
         opts[:data_container] = data[:data_container]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.32
 platform: ruby
 authors:
 - Sean OMeara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver that talks to the Docker Remote API and uses Volumes