kitchen-dokken 2.17.1 → 2.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 439fb37e48ca255580cdd6030a23c4c1b4e7934f068673dab400580f74220a36
-  data.tar.gz: 30bf493770664d64183dda32f620e28c8ce52a101c9a0dff102722bfb9e22f1c
+  metadata.gz: f67251f6bccb051c90cfdc31f414a7319d9c915c2cca6a512cb73583488581e1
+  data.tar.gz: 3b1a1a6548831088fa4f775ccbb01d3f98e8d357f3495799fc841048668a8eb7
 SHA512:
-  metadata.gz: 167d8f6dcee24404a402a7e7949f80acbb8cf6e1ee12cdfe523913dadf5ef17f384b88a49670c8012e471ea2599b8095e13485423cfe67c55d9261cb0fe7191c
-  data.tar.gz: ea8a6a0462740bab02bdcd0ef0ab2bf2810a3f097523c5f6cb824e8b25cf31a023aefbb3b3fda796b68fa4ea560b3b92281a0f178f882047c86e39b1aad6e8c0
+  metadata.gz: 8cd2b0ad664f9cb28fd2788bb7cd41e0ae3316c7b67283be934b37b94d8d85e617bb171d67f1b595183cf533b4820e88ca72fabdb530343c5ba7bfb9b693193d
+  data.tar.gz: 1dc14374c7abf5a99de55559ded7537ab5e6e1b97c5f8d69f9724714b90f02f5536991c63da3368c31bfb7aa772609aab6adc48aa3ba09939408805e7321ab97

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,35 @@ 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")
+        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
+
+        @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 +652,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.1".freeze
+    DOKKEN_VERSION = "2.17.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.17.1
+  version: 2.17.2
 platform: ruby
 authors:
 - Sean OMeara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2022-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api