kitchen-dokken 2.15.0 → 2.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d549607487cae2cf1d58c9fadfed6e5c0649d085b27dc0841abf32d4a23670df
-  data.tar.gz: 4be3556b19ae6795d6c70d196913ed79f7d14971dc386f539a0321683ecdf49b
+  metadata.gz: 439fb37e48ca255580cdd6030a23c4c1b4e7934f068673dab400580f74220a36
+  data.tar.gz: 30bf493770664d64183dda32f620e28c8ce52a101c9a0dff102722bfb9e22f1c
 SHA512:
-  metadata.gz: ee6f97ad4f722b828f9d0508a69224ef7ae4514b39280a3c84ae14351626939e04d7fdae779c4280efcc4d88210a37fad02dab74ad638432d8aa1e929e40e1e7
-  data.tar.gz: 5035e7f732b10ed7f9407555d612441c509985acd6d33d577d23c02c0529cd80be0f93c2c668fc0355135ed765e9844d075adfaf417de441a501858588042e2a
+  metadata.gz: 167d8f6dcee24404a402a7e7949f80acbb8cf6e1ee12cdfe523913dadf5ef17f384b88a49670c8012e471ea2599b8095e13485423cfe67c55d9261cb0fe7191c
+  data.tar.gz: ea8a6a0462740bab02bdcd0ef0ab2bf2810a3f097523c5f6cb824e8b25cf31a023aefbb3b3fda796b68fa4ea560b3b92281a0f178f882047c86e39b1aad6e8c0

data/lib/kitchen/driver/dokken.rb

@@ -66,9 +66,13 @@ module Kitchen
       default_config :userns_host, false
       default_config :volumes, nil
       default_config :write_timeout, 3600
+      default_config :creds_file, nil
 
       # (see Base#create)
       def create(state)
+        # Authenticate the private registry
+        authenticate!
+
         # image to config
         pull_platform_image
 
@@ -410,6 +414,21 @@ 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 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 +621,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, 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.15.0".freeze
+    DOKKEN_VERSION = "2.17.1".freeze
   end
 end

data/lib/kitchen/transport/dokken.rb

@@ -69,7 +69,9 @@ module Kitchen
 
           with_retries { @runner = ::Docker::Container.get(instance_name, {}, docker_connection) }
           with_retries do
-            o = @runner.exec(Shellwords.shellwords(command), wait: options[:timeout], "e" => { "TERM" => "xterm" }) { |_stream, chunk| print chunk.to_s }
+            o = @runner.exec(Shellwords.shellwords(command), wait: options[:timeout], "e" => { "TERM" => "xterm" }) do |_stream, chunk|
+              logger << chunk
+            end
             @exit_code = o[2]
           end
 
@@ -224,6 +226,7 @@ module Kitchen
       # @api private
       def connection_options(data)
         opts = {}
+        opts[:logger] = logger
         opts[:host_ip_override] = config[:host_ip_override]
         opts[:docker_host_url] = config[:docker_host_url]
         opts[:docker_host_options] = ::Docker.options

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.17.1
 platform: ruby
 authors:
 - Sean OMeara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2022-06-14 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