kitchen-dokken 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bacb04ce73c020022800976bb73ed93889a9cddb
-  data.tar.gz: ccda73ee5de4c0409ebaaad8c62606db31ed52b4
+  metadata.gz: d6db975f50f90cf847c61c52623517c7d596efb0
+  data.tar.gz: 5ff09558f9547141d31782b9538b242583518170
 SHA512:
-  metadata.gz: b932eb19ed1f361724190a35dd18008dd0cfb90b77f919f626041beb28176aac7642bb09264443d11ca57d49daeb7e574899704aab626f9f48ed6b0f09e7efd8
-  data.tar.gz: 5a7bb932b1d29e098f89ed805ebbbdae46bbd31d6551631694eb228b329b38c458931daa1465f4614d47b0385e0aca3552c3e02309c089b11254a6bdffc778e9
+  metadata.gz: 5898ca693aab9b8122668458580032751148cf404f718d8c03d3a8941a6ab4f4f519037c34022719d89f35f5c85858034eab55ad0e6e4f4a09fa04b49116c357
+  data.tar.gz: 5867030831ed974e2ee63d69925c92f8da0bb27092bd5af747293b4d90aa80e390a7bab53f183e9efae8027b687657837f0140063e99b959d0d86e87fc5af825

data/lib/kitchen/driver/dokken.rb

@@ -95,8 +95,24 @@ module Kitchen
         FileUtils.mkdir_p context_root
         File.write("#{context_root}/Dockerfile", work_image_dockerfile)
 
-        with_retries { @work_image = Docker::Image.build_from_dir(context_root, { 'nocache' => true, 'rm' => true }, docker_connection) }
-        with_retries { @work_image.tag('repo' => repo(work_image), 'tag' => tag(work_image), 'force' => true) }
+        with_retries do
+          begin
+          @work_image = Docker::Image.build_from_dir(
+            context_root,
+            { 'nocache' => true, 'rm' => true },
+            docker_connection
+              )
+          rescue
+            puts "SEANDEBUG: EXPLOSIONS"
+          end
+        end
+
+        with_retries do
+          @work_image.tag(
+            'repo' => repo(work_image),
+            'tag' => tag(work_image),
+            'force' => true)
+        end
         state[:work_image] = work_image
       end
 

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.12'
+    DOKKEN_VERSION = '0.0.13'
   end
 end

data/lib/kitchen/transport/dokken.rb

@@ -62,23 +62,25 @@ module Kitchen
         def execute(command)
           return if command.nil?
 
-          runner = Docker::Container.get(instance_name, {}, docker_connection)
-          o = runner.exec(Shellwords.shellwords(command)) { |_stream, chunk| print "#{chunk}" }
-          exit_code = o[2]
+          with_retries { @runner = Docker::Container.get(instance_name, {}, docker_connection) }
+          with_retries do
+            o = @runner.exec(Shellwords.shellwords(command)) { |_stream, chunk| print "#{chunk}" }
+            @exit_code = o[2]
+          end
 
-          if exit_code != 0
+          if @exit_code != 0
             fail Transport::DockerExecFailed,
-                 "Docker Exec (#{exit_code}) for command: [#{command}]"
+                 "Docker Exec (#{@exit_code}) for command: [#{command}]"
           end
 
           begin
             old_image = Docker::Image.get(work_image, {}, docker_connection)
-            old_image.remove
+            with_retries { old_image.remove }
           rescue
             debug "#{work_image} not present. nothing to remove."
           end
 
-          new_image = runner.commit
+          new_image = @runner.commit
           new_image.tag('repo' => work_image, 'tag' => 'latest', 'force' => 'true')
         end
 
@@ -115,8 +117,8 @@ module Kitchen
         end
 
         def login_command
-          runner = "#{options[:instance_name]}"
-          args = ['exec', '-it', runner, '/bin/bash', '-login', '-i']
+          @runner = "#{options[:instance_name]}"
+          args = ['exec', '-it', @runner, '/bin/bash', '-login', '-i']
           LoginCommand.new('docker', args)
         end
 
@@ -134,6 +136,21 @@ module Kitchen
         def image_prefix
           options[:image_prefix]
         end
+
+        def with_retries(&block)
+          tries = 20
+          begin
+            block.call
+            # Only catch errors that can be fixed with retries.
+          rescue Docker::Error::ServerError, # 404
+            Docker::Error::UnexpectedResponseError, # 400
+            Docker::Error::TimeoutError,
+            Docker::Error::IOError => e
+            tries -= 1
+            retry if tries > 0
+            raise e
+          end
+        end        
       end
 
       private

metadata

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