kitchen-dokken 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee6436b7ffb1c6900e881ac88e7c6c9ee193a35b
-  data.tar.gz: 7d2146ac76c4c773f664ccc89662f1d43fd34408
+  metadata.gz: a6faedc62e4a95ff06ad9c9a4afd428a5425bc2f
+  data.tar.gz: cb50755ddd17da4665f970074923b3bbc4772b31
 SHA512:
-  metadata.gz: 1bb9a600392ff422bf25caaabaf235861a65ef150075bf2c87bb823fdd768c47a56e263cdb5379d46f6bf9f1bec725085fcac549949c9e2c7e9144cfc68f3765
-  data.tar.gz: dd3093f15147c00fe18d7c4b2010b7776bbd86ccce70ea2c1402cfae41408162b418d4849460ba41194cea29fdf801878aea090e0ce5af672e0a8cac55f42eca
+  metadata.gz: 9f13f85e051f52c4b83fac23801225cffedbc61b45d315dfe2eaba70936d199bd8e12f97bac5f3ca8aaf13b115fa914827a55ffcb7c156661e38a2903f006cac
+  data.tar.gz: 20c36d16247c48c1b66b37d130cd36a6025182ee00c9a1deccb51058f06617a7beb23a1fd4e813dc2df102fa361cfc4573f7840cd217db0acbc01089b6313271

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Dokken Changelog
 
+# 2.2.4
+- bugfix: Only placing runner containers in user defined network
+
 # 2.2.3
 - bugfix: Adding gaurd logic for already existing dokken network
 

data/lib/kitchen/driver/dokken.rb

@@ -282,26 +282,20 @@ module Kitchen
             'PublishAllPorts' => true,
             'NetworkMode' => self[:network_mode],
           },
-          'NetworkingConfig' => {
-            'EndpointsConfig' => {
-              self[:network_mode] => {
-                'Aliases' => Array(self[:hostname]),
-              },
-            },
-          },
         }
         data_container = run_container(config)
         state[:data_container] = data_container.json
       end
 
       def make_dokken_network
-        debug 'driver - creating dokken network'
+        info 'driver - checking for dokken network'
         ::Docker::Network.get('dokken', {}, docker_connection)
       rescue
         begin
-          Docker::Network.create('dokken', {})
+          info 'driver - creating dokken network'
+          ::Docker::Network.create('dokken', {})
         rescue ::Docker::Error => e
-          debug "driver - :#{e}:"
+          info "driver - :#{e}:"
         end
       end
 
@@ -322,13 +316,6 @@ module Kitchen
             'HostConfig' => {
               'NetworkMode' => self[:network_mode],
             },
-            'NetworkingConfig' => {
-              'EndpointsConfig' => {
-                self[:network_mode] => {
-                  'Aliases' => Array(self[:hostname]),
-                },
-              },
-            },
           }
           chef_container = create_container(config)
           state[:chef_container] = chef_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 = '2.2.3'.freeze
+    DOKKEN_VERSION = '2.2.4'.freeze
   end
 end

data/lib/kitchen/transport/dokken.rb

@@ -96,7 +96,7 @@ module Kitchen
             raise Kitchen::UserError, 'docker_host_url must be tcp:// or unix://'
           end
 
-          tmpdir = Dir.tmpdir + '/dokken/'
+          require 'pry'; tmpdir = Dir.tmpdir + '/dokken/'
           FileUtils.mkdir_p tmpdir.to_s, mode: 0o777
           tmpdir += Process.uid.to_s
           FileUtils.mkdir_p tmpdir.to_s
@@ -117,6 +117,7 @@ module Kitchen
             rsync_cmd << " -p #{port}"
             rsync_cmd << '\''
             rsync_cmd << " #{locals.join(' ')} root@#{ip}:#{remote}"
+            debug "rsync_cmd :#{rsync_cmd}:"
             `#{rsync_cmd}`
           rescue Errno::ENOENT
             debug 'Rsync is not installed. Falling back to SCP.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Sean OMeara