kitchen-dokken 2.16.0 → 2.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c1eb7ea3b8b7026368f17e936583541737f204457ac3717a1d30107635330f9
-  data.tar.gz: 2606b5d2255543272111230715c7b6a050e3e58b7957d6335265d884059e52db
+  metadata.gz: f67251f6bccb051c90cfdc31f414a7319d9c915c2cca6a512cb73583488581e1
+  data.tar.gz: 3b1a1a6548831088fa4f775ccbb01d3f98e8d357f3495799fc841048668a8eb7
 SHA512:
-  metadata.gz: 5c91016a21ae59923337c4e91fb61ef3920918da3340b24427392b325a812d016727c98482409eaeee9c825074a3b5559e669c4bc4ac5e67bd5bf5b6fdf43347
-  data.tar.gz: 388e6ba61fc2c4d2ba88e28780e4b541dc7dffe426f4250d7a6a99b52bbb1c0c98f6c9ae6bc306bdd640273b41f2852e83a851556d5a226aa1912bc4a04f02ff
+  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
@@ -66,9 +67,14 @@ module Kitchen
       default_config :userns_host, false
       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)
+        # Authenticate the private registry
+        authenticate!
+
         # image to config
         pull_platform_image
 
@@ -410,6 +416,50 @@ module Kitchen
         end
       end
 
+      def authenticate!
+        # No need to authenticate if the credentials are empty
+        return if docker_creds.empty?
+
+        ::Docker.authenticate! docker_creds
+      end
+
+      def docker_creds
+        @docker_creds ||= if config[:creds_file]
+                            JSON.parse(IO.read(config[:creds_file]))
+                          else
+                            {}
+                          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)
@@ -602,7 +652,7 @@ module Kitchen
             original_image = Docker::Image.get(path, {}, docker_connection)
           end
 
-          new_image = Docker::Image.create({ "fromImage" => path }, {}, 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.16.0".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.16.0
+  version: 2.17.2
 platform: ruby
 authors:
 - Sean OMeara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-23 00:00:00.000000000 Z
+date: 2022-06-16 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.22
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver for Docker & Chef Infra optimized for rapid testing