kitchen-dokken 2.17.0 → 2.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b2d590af89b1fde3cb1a0d5a5d681abbd377462aaa0cde0b2b7809802db21e1
-  data.tar.gz: 92983e5510abd9b522fc7a046d62d56637f56c321504ad5d0691f21e8e2db4dd
+  metadata.gz: ca4a37e299f05169d18ddc09aaf05dac0690c0aaf6ae6d4d19833e4c52bea6da
+  data.tar.gz: fbe097fca4cce344f710a8b7821c55512e9c5dd576f7dcd472395a2479a90acb
 SHA512:
-  metadata.gz: fa71281c52fc0e3004fd5a243e9c595a76648a5038d0fa8f2bb842a05d4b9ea34c2c7666b48d297882243241687d837eeae04fc8a75f33a98dfa50971e252f41
-  data.tar.gz: 722f40d25fc652b26c353a81262d769ebfff3159317b38b7f7c1f8111fd8585d335970261646dd4092fad3aa6d860698f116ca5f71946f2ebaa1b97700bbffbc
+  metadata.gz: 042aa06968c356ef83782bfa36e1001e38a0aac60b0eb797345e0832b2648c1f56c1f8d734c27884cdd4a07f58145df656738e6b8d8a2afe2abe5d1957a90abd
+  data.tar.gz: 9a5ac2a2f805da0306c61edb2e31a7d5b402c83ce037973ac37a9c17d35cd7ca342c549f0406e58992e3382995d61385132b9a095fe3339ec710158d706ed552

data/lib/kitchen/driver/dokken.rb

@@ -20,6 +20,7 @@ require "kitchen"
 require "tmpdir" unless defined?(Dir.mktmpdir)
 require "docker"
 require "lockfile"
+require "base64" unless defined?(Base64)
 require_relative "../helpers"
 
 include Dokken::Helpers
@@ -67,6 +68,7 @@ module Kitchen
       default_config :volumes, nil
       default_config :write_timeout, 3600
       default_config :creds_file, nil
+      default_config :docker_config_creds, false
 
       # (see Base#create)
       def create(state)
@@ -429,6 +431,39 @@ module Kitchen
                           end
       end
 
+      def docker_config_creds
+        return @docker_config_creds if @docker_config_creds
+
+        @docker_config_creds = {}
+        config_file = ::File.join(::Dir.home, ".docker", "config.json")
+        if ::File.exist?(config_file)
+          JSON.load_file!(config_file)["auths"].each do |k, v|
+            next if v["auth"].nil?
+
+            username, password = Base64.decode64(v["auth"]).split(":")
+            @docker_config_creds[k] = { serveraddress: k, username: username, password: password }
+          end
+        else
+          debug("~/.docker/config.json does not exist")
+        end
+
+        @docker_config_creds
+      end
+
+      def docker_creds_for_image(image)
+        return docker_creds if config[:creds_file]
+
+        image_registry = image.split("/").first
+
+        # NOTE: Try to use DockerHub auth if exact registry match isn't found
+        default_registry = "https://index.docker.io/v1/"
+        if docker_config_creds.key?(image_registry)
+          docker_config_creds[image_registry]
+        elsif docker_config_creds.key?(default_registry)
+          docker_config_creds[default_registry]
+        end
+      end
+
       def pull_platform_image
         debug "driver - pulling #{short_image_path(platform_image)}"
         config[:pull_platform_image] ? pull_image(platform_image) : pull_if_missing(platform_image)
@@ -621,7 +656,7 @@ module Kitchen
             original_image = Docker::Image.get(path, {}, docker_connection)
           end
 
-          new_image = Docker::Image.create({ "fromImage" => path }, docker_creds, docker_connection)
+          new_image = Docker::Image.create({ "fromImage" => path }, docker_creds_for_image(image), docker_connection)
 
           !(original_image && original_image.id.start_with?(new_image.id))
         end

data/lib/kitchen/driver/dokken_version.rb

@@ -18,6 +18,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = "2.17.0".freeze
+    DOKKEN_VERSION = "2.17.3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.17.0
+  version: 2.17.3
 platform: ruby
 authors:
 - Sean OMeara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver for Docker & Chef Infra optimized for rapid testing