kitchen-dokken 2.12.1 → 2.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 517d0d0706aed8e8fc5889c874d6817fe65cfa571ba3a7a082d8256f707986cd
-  data.tar.gz: f5beb66dc47d9c4f58022c26af3ce8657c7fae40443eb2d3ee1b5ef2c01f5d0e
+  metadata.gz: 8c1eb7ea3b8b7026368f17e936583541737f204457ac3717a1d30107635330f9
+  data.tar.gz: 2606b5d2255543272111230715c7b6a050e3e58b7957d6335265d884059e52db
 SHA512:
-  metadata.gz: fd3d097a36e249e21f88ea3a1999207f9e45e464a9eb649d10c870d24d4a0705766dfb57df3ced2c82cda4e6cee04d5b53587b36743dbdd887da036d00c5d7c8
-  data.tar.gz: 755b9671c1aa2cbf14a90ddb9c730e3d50d5326a6244f2d8ece875b5bf5b5e9567c3c5f9661cd6cb6a00e6e4ec0594efcd5aa2fe0daf56e0fca7bf78c6a76d61
+  metadata.gz: 5c91016a21ae59923337c4e91fb61ef3920918da3340b24427392b325a812d016727c98482409eaeee9c825074a3b5559e669c4bc4ac5e67bd5bf5b6fdf43347
+  data.tar.gz: 388e6ba61fc2c4d2ba88e28780e4b541dc7dffe426f4250d7a6a99b52bbb1c0c98f6c9ae6bc306bdd640273b41f2852e83a851556d5a226aa1912bc4a04f02ff

data/lib/kitchen/driver/dokken.rb

@@ -48,7 +48,10 @@ module Kitchen
       default_config :entrypoint, nil
       default_config :env, nil
       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"
@@ -313,7 +316,7 @@ module Kitchen
           "NetworkingConfig" => {
             "EndpointsConfig" => {
               self[:network_mode] => {
-                "Aliases" => Array(self[:hostname]),
+                "Aliases" => Array(self[:hostname]).concat(Array(self[:hostname_aliases])),
               },
             },
           },
@@ -358,7 +361,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
@@ -599,7 +602,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_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.12.1".freeze
+    DOKKEN_VERSION = "2.16.0".freeze
   end
 end

data/lib/kitchen/helpers.rb

@@ -117,6 +117,8 @@ VOLUME /opt/verifier
     end
 
     def docker_info
+      ::Docker.url = default_docker_host
+
       @docker_info ||= ::Docker.info
     rescue Excon::Error::Socket
       puts "kitchen-dokken could not connect to the docker host at #{default_docker_host}. Is docker running?"
@@ -175,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
@@ -244,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/provisioner/dokken.rb

@@ -109,12 +109,13 @@ module Kitchen
         cmd << " -c /opt/kitchen/client.rb"
         cmd << " -j /opt/kitchen/dna.json"
         cmd << "--profile-ruby" if config[:profile_ruby]
+        cmd << "--slow-report" if config[:slow_resource_report]
 
         chef_cmd(cmd)
       end
 
       def write_run_command(command)
-        File.write("#{dokken_kitchen_sandbox}/run_command", command)
+        File.write("#{dokken_kitchen_sandbox}/run_command", command, mode: "wb")
       end
 
       def runner_container_name

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.12.1
+  version: 2.16.0
 platform: ruby
 authors:
 - Sean OMeara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-10-23 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.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver for Docker & Chef Infra optimized for rapid testing