kitchen-dokken 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f99765024f84e7ed1247430ee079552dfe854aaf
-  data.tar.gz: a46f76f7279a9c1e338ad618872bc2f84a2e120c
+  metadata.gz: 5758ff1410fbf25008ce323eab6d27340835c482
+  data.tar.gz: 3efaa5e7c5ef7cbe4ddd452b16d53a78beb9bba7
 SHA512:
-  metadata.gz: c7286b5e1d1f24cbc0e496885d425f3a72008784f212580626ce9b36c701dd943109eab6c6677535955aaa6482c50218caab785cfdfe242f12a9f429c2d75d91
-  data.tar.gz: c6a1aba29911833f2d3e39d2c3da8ea98137bed40b9667c734fbb7ef32513e5ed8bde93ab9ea0f4523c80cf40a730b3938c5cec55100def8757521428af2f1ae
+  metadata.gz: aedf4dd36c3e2fdc23afdc970b4f1f55829dc3cd1133327e033871dd43bc0a1e24b61c3b795e1c0d9d20642cf29dab834f2b5791efbdc40d9d4389d0c462bf5f
+  data.tar.gz: e412ab58916d486eaa0c4e0d31532a3e28e4888e5ebc054152af1051f83b68b1332010daa06a0af91b243a296b93a4597a444b73a095cd444728e20390279939

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Dokken Changelog
 
+# 2.2.2
+- bugfix: Creating dokken network before chef container
+
 # 2.2.1
 - Putting chef-client container in dokken network
 - casting aliases to Array

data/lib/kitchen/driver/dokken.rb

@@ -60,13 +60,13 @@ module Kitchen
         # image to config
         pull_platform_image
 
+        # network
+        make_dokken_network
+        
         # chef
         pull_chef_image
         create_chef_container state
 
-        # network
-        make_dokken_network
-
         # data
         dokken_create_sandbox
 
@@ -297,8 +297,8 @@ module Kitchen
       def make_dokken_network
         debug 'driver - creating dokken network'
         Docker::Network.create('dokken', {})
-      rescue
-        debug 'driver - dokken network already exists'
+      rescue ::Docker::Error => e
+        debug "driver - :#{e}:"
       end
 
       def make_data_image
@@ -311,24 +311,25 @@ module Kitchen
       rescue ::Docker::Error::NotFoundError
         begin
           debug "driver - creating volume container #{chef_container_name} from #{chef_image}"
-          chef_container = create_container(
+          config = {
             'name' => chef_container_name,
             'Cmd' => 'true',
             'Image' => "#{repo(chef_image)}:#{tag(chef_image)}",
             'HostConfig' => {
-              'NetworkMode' => config[:network_mode],
+              'NetworkMode' => self[:network_mode],
             },
             'NetworkingConfig' => {
               'EndpointsConfig' => {
                 self[:network_mode] => {
-                  'Aliases' => Array(config[:hostname]),
+                  'Aliases' => Array(self[:hostname]),
                 },
               },
-            }
-          )
+            },
+          }
+          chef_container = create_container(config)
           state[:chef_container] = chef_container.json
-        rescue
-          debug "driver - #{chef_container_name} already exists"
+        rescue ::Docker::Error => e
+          raise "driver - #{chef_container_name} failed to create #{e}"
         end
       end
 

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.1'.freeze
+    DOKKEN_VERSION = '2.2.2'.freeze
   end
 end

metadata

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