kitchen-dokken 2.6.3 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9780ec5eb501855b4344db2651e9fa7202dba444
-  data.tar.gz: 77cc40dbd981cd81e52de7d59d870b3334f6ea22
+  metadata.gz: 38f3e60601861d39bb5fac0c4b61f4b48bf74d18
+  data.tar.gz: bfc604ab2cb58921179dd9941ab4eb88ebfc1bb1
 SHA512:
-  metadata.gz: c3fe225b9dfa13eeb1345f9c0cbd0231e1d191677b865ab879b5f9a7e00e57c69fa8fbc255c417700800b0f26d7e293c0985d154a06d3d7cd09d751e2ec62b39
-  data.tar.gz: 416adb068a884ecb25d08225ebdd37f1b378911969359471e2dc694b06a320e131682d27f5e479fac37aba560919b25af856ae36f93de36deb73be9df69ab578
+  metadata.gz: 07de864daf80e155c37d8a8c5525a78a5ba9e1c7735d32d69d986c4ba79afc864423eea8c8dfe83debc461bf27361d9fb83e6673f986e48cf70a1a17e8276e98
+  data.tar.gz: 8dc29e3e6eb530aaa07d090c2812480bdc54c0d60953655f6619d0e7d3d5619c81b4c5452072cf3ef27cadc09fb8b0519260c43a20d5f9cff5f3498012df19bf

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Dokken Changelog
 
+# 2.6.4
+- Fixing pull_image method to check for new id
+
 # 2.6.3
 - tmpfs support
 

data/lib/kitchen/driver/dokken.rb

@@ -155,11 +155,11 @@ module Kitchen
       def work_image_dockerfile
         dockerfile_contents = [
           "FROM #{platform_image}",
-          "LABEL X-Built-By=kitchen-dokken X-Built-From=#{platform_image}"
+          "LABEL X-Built-By=kitchen-dokken X-Built-From=#{platform_image}",
         ]
-        Array(config[:intermediate_instructions]).each { |c|
+        Array(config[:intermediate_instructions]).each do |c|
           dockerfile_contents << c
-        }
+        end
         dockerfile_contents.join("\n")
       end
 
@@ -230,7 +230,7 @@ module Kitchen
           v
         else
           Array(v).each_with_object({}) do |y, h|
-            name, opts = y.split(':',2)
+            name, opts = y.split(':', 2)
             h[name.to_s] = opts.to_s
           end
         end
@@ -296,8 +296,8 @@ module Kitchen
             },
           },
         }
-        unless self[:entrypoint].to_s.length == 0
-          config.merge!('Entrypoint' => self[:entrypoint])
+        unless self[:entrypoint].to_s.empty?
+          config['Entrypoint'] = self[:entrypoint]
         end
         runner_container = run_container(config)
         state[:runner_container] = runner_container.json
@@ -376,7 +376,7 @@ module Kitchen
 
       def pull_platform_image
         debug "driver - pulling #{chef_image} #{repo(platform_image)} #{tag(platform_image)}"
-        pull_if_missing platform_image
+        pull_image platform_image
       end
 
       def pull_chef_image
@@ -520,9 +520,20 @@ module Kitchen
         pull_image image
       end
 
+      # https://github.com/docker/docker/blob/4fcb9ac40ce33c4d6e08d5669af6be5e076e2574/registry/auth.go#L231
+      def parse_registry_host(val)
+        val.sub(%r{https?://}, '').split('/').first
+      end
+
       def pull_image(image)
         with_retries do
-          ::Docker::Image.create({ 'fromImage' => "#{repo(image)}:#{tag(image)}" }, nil, docker_connection)
+          if Docker::Image.exist?("#{repo(image)}:#{tag(image)}", {}, docker_connection)
+            original_image = Docker::Image.get("#{repo(image)}:#{tag(image)}", {}, docker_connection)
+          end
+
+          new_image = Docker::Image.create({ 'fromImage' => "#{repo(image)}:#{tag(image)}" }, docker_connection)
+
+          !(original_image && original_image.id.start_with?(new_image.id))
         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.6.3'.freeze
+    DOKKEN_VERSION = '2.6.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.6.4
 platform: ruby
 authors:
 - Sean OMeara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen