kitchen-dokken 2.13.0 → 2.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eea74ed725f969f5c886cfa3779e4b3a9094709f70e18bfe6793b913ce56c23
-  data.tar.gz: dc4492c20b777baa7d2063156bd37c31db378545af392f49895878e9e1523b91
+  metadata.gz: 0b2d590af89b1fde3cb1a0d5a5d681abbd377462aaa0cde0b2b7809802db21e1
+  data.tar.gz: 92983e5510abd9b522fc7a046d62d56637f56c321504ad5d0691f21e8e2db4dd
 SHA512:
-  metadata.gz: d3020a6b005734959245fcc28401fed70d80755d05f807f22933478a6f58bf481333284959cdb2a5b533e5f56db98174a0aaca2a0d5d015767062ac081e2e2e3
-  data.tar.gz: e62c1cb7e25243ede096137079403302162d550aa7fc076ad8dcfaefda26b230a12baac451b3bd788754099c0fb55bc4b4d033acd719b4049d18652214514434
+  metadata.gz: fa71281c52fc0e3004fd5a243e9c595a76648a5038d0fa8f2bb842a05d4b9ea34c2c7666b48d297882243241687d837eeae04fc8a75f33a98dfa50971e252f41
+  data.tar.gz: 722f40d25fc652b26c353a81262d769ebfff3159317b38b7f7c1f8111fd8585d335970261646dd4092fad3aa6d860698f116ca5f71946f2ebaa1b97700bbffbc

data/lib/kitchen/driver/dokken.rb

@@ -50,6 +50,8 @@ module Kitchen
       default_config :hostname, "dokken"
       default_config :hostname_aliases, nil
       default_config :image_prefix, nil
+      default_config :ipv6, false
+      default_config :ipv6_subnet, "2001:db8:1::/64" # "2001:db8::/32 Range reserved for documentation"
       default_config :links, nil
       default_config :memory_limit, 0
       default_config :network_mode, "dokken"
@@ -64,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
 
@@ -359,7 +365,7 @@ module Kitchen
           with_retries { ::Docker::Network.get("dokken", {}, docker_connection) }
         rescue ::Docker::Error::NotFoundError
           begin
-            with_retries { ::Docker::Network.create("dokken", {}) }
+            with_retries { ::Docker::Network.create("dokken", network_settings) }
           rescue ::Docker::Error => e
             debug "driver - error :#{e}:"
           end
@@ -408,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)
@@ -600,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.13.0".freeze
+    DOKKEN_VERSION = "2.17.0".freeze
   end
 end

data/lib/kitchen/helpers.rb

@@ -177,6 +177,21 @@ VOLUME /opt/verifier
       coerce_exposed_ports(config[:ports])
     end
 
+    def network_settings
+      if self[:ipv6]
+        {
+          "EnableIPv6" => true,
+          "IPAM" => {
+            "Config" => [{
+              "Subnet" => self[:ipv6_subnet],
+            }],
+          },
+        }
+      else
+        {}
+      end
+    end
+
     def port_bindings
       coerce_port_bindings(config[:ports])
     end
@@ -246,6 +261,7 @@ VOLUME /opt/verifier
     end
 
     def remote_docker_host?
+      return false if config[:docker_info]["OperatingSystem"].include?("Docker Desktop")
       return false if config[:docker_info]["OperatingSystem"].include?("Boot2Docker")
       return true if /^tcp:/.match?(config[:docker_host_url])
 

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.13.0
+  version: 2.17.0
 platform: ruby
 authors:
 - Sean OMeara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -53,7 +53,7 @@ dependencies:
         version: '1.15'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
         version: '1.15'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 description: A Test Kitchen Driver for Docker & Chef Infra optimized for rapid testing
   using Chef Infra docker images
 email:
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver for Docker & Chef Infra optimized for rapid testing