kitchen-dokken 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 281a9d81aca687090ac3b3a3f3751eb2ecbe954a
-  data.tar.gz: 852aa96acd876d19e13e8d820f5f0a937ad24b85
+  metadata.gz: 99d5c42ad41344aa4fb42cf678e021cb27752e38
+  data.tar.gz: 48a71a81222ca328947e6816ef1c51824314e461
 SHA512:
-  metadata.gz: 2b07def8cc14a9ce8e23eb9abaccc0551b2ae82af4a65df82e58adce84cf23ce90ae53b51576036f19963642e4b61fedaf2c6d93dc9a3d1d3507023a33d6cce7
-  data.tar.gz: c18f97870cd8f9d02eb5c81f6c72f4b64865c9683a8794cb7ef6ee98174b0fbc6bf0dd4d6d1d9087be3217db5958857b87514dc4f396f30c60d8568a08cc2746
+  metadata.gz: dc4df8b2f9d8e7be77eece101dff36131f78eea156b0fcf0389dc569f029fb758c3fc7db176abbce9581de935de86b955c2baa84c2b81e1137628d3b625a865c
+  data.tar.gz: 40c369d395cffa75d9af7dfbd0368dcb8310039b3fdd47b20fa8b440c88c68630319976830965daf5b047ecefdae09e6dff908df764329bf0cab41520f57efc8

data/lib/kitchen/driver/dokken.rb

@@ -95,23 +95,24 @@ module Kitchen
         FileUtils.mkdir_p context_root
         File.write("#{context_root}/Dockerfile", work_image_dockerfile)
 
-        with_retries do
-          begin
+        begin
+          with_retries do
             @work_image = Docker::Image.build_from_dir(
               context_root,
               { 'nocache' => true, 'rm' => true },
               docker_connection
             )
-          rescue
-            debug "work_image build failed. retrying."
           end
+        rescue
+          raise 'work_image build failed'
         end
 
         with_retries do
           @work_image.tag(
             'repo' => repo(work_image),
             'tag' => tag(work_image),
-            'force' => true)
+            'force' => true
+          )
         end
         state[:work_image] = work_image
       end
@@ -241,7 +242,10 @@ module Kitchen
       def delete_container(name)
         with_retries { @container = Docker::Container.get(name, docker_connection) }
         puts "Destroying container #{name}."
-        with_retries { @container.stop(force: true) }
+        with_retries do
+          @container.stop(force: true)
+          wait_running_state(args['name'], false)
+        end
         with_retries { @container.delete(force: true, v: true) }
       rescue
         puts "Container #{name} not found. Nothing to delete."

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.14'
+    DOKKEN_VERSION = '0.0.15'
   end
 end

data/lib/kitchen/transport/dokken.rb

@@ -74,13 +74,13 @@ module Kitchen
           end
 
           begin
-            @old_image = Docker::Image.get(work_image, {}, docker_connection)
+            with_retries { @old_image = Docker::Image.get(work_image, {}, docker_connection) }
             with_retries { @old_image.remove }
           rescue
             debug "#{work_image} not present. nothing to remove."
           end
 
-          @new_image = @runner.commit
+          with_retries { @new_image = @runner.commit }
           with_retries { @new_image.tag('repo' => work_image, 'tag' => 'latest', 'force' => 'true') }
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Sean OMeara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-24 00:00:00.000000000 Z
+date: 2015-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen