kitchen-dokken 2.21.0 → 2.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75320b721c7b0d35bd1d5405cebf349e5e088011dc1ee3c3aaf8576f3a9f261a
-  data.tar.gz: da4956467f5139937cd40b06bfaeb0410f865a70f16b81bb562b05affc7568ab
+  metadata.gz: 7fdf8e2760518e4111926d61f98208aff49627aa8c2b0b59db6c407686e9fc76
+  data.tar.gz: 1580df76853f7a62551f3c66b3e01d575c71c64efeffef092d66c2455c0c9df5
 SHA512:
-  metadata.gz: 608b0a623e7ee0033478972368e7df9fdd28989b3a3aa60ab675891960fef5b6ca9468532c9984108bd3de9b23a64264ed968875ba64e82c8de762bbeb265271
-  data.tar.gz: 1851fe00d79ae0ae134d91aecd3569a4f910e2cb19c0e8dec7883949f969fb895307ed242a44fd972f1365744fd9203bd8be1fdb2f0a1fcc03deef1a346f3a0e
+  metadata.gz: eb5c56ae989af89f74abc40767939a74579959192f0cd840a8b96efad5ea4006fbaa5d39a3c426a1073bd0e4be58f83d1046deb0afcf3d2019d773a65f3175ff
+  data.tar.gz: b6506bd5e7d5728e0c8d3e4a7690475b49d517294ab0d3559f22b390ac4eb5a1f83fa37a53710c5ea2682c601af749ea4cbaa148331cfd2a7d6f997134a4bdb5

data/lib/kitchen/driver/dokken.rb

@@ -45,7 +45,9 @@ module Kitchen
       default_config :dns, nil
       default_config :dns_search, nil
       default_config :docker_host_url, default_docker_host
-      default_config :docker_info, docker_info
+      default_config :docker_info do |driver|
+        docker_info(driver[:docker_host_url])
+      end
       default_config :docker_registry, nil
       default_config :entrypoint, nil
       default_config :env, nil
@@ -138,9 +140,9 @@ module Kitchen
       end
 
       def delete_work_image
-        return unless ::Docker::Image.exist?(work_image, { "platform" => config[:platform] }, docker_connection)
+        return unless ::Docker::Image.exist?(work_image, { "platform" => oci_platform(config[:platform]) }, docker_connection)
 
-        with_retries { @work_image = ::Docker::Image.get(work_image, { "platform" => config[:platform] }, docker_connection) }
+        with_retries { @work_image = ::Docker::Image.get(work_image, { "platform" => oci_platform(config[:platform]) }, docker_connection) }
 
         with_retries do
           with_retries { @work_image.remove(force: true) }
@@ -151,7 +153,7 @@ module Kitchen
 
       def build_work_image(state)
         info("Building work image..")
-        return if ::Docker::Image.exist?(work_image, { "platform" => config[:platform] }, docker_connection)
+        return if ::Docker::Image.exist?(work_image, { "platform" => oci_platform(config[:platform]) }, docker_connection)
 
         begin
           @intermediate_image = ::Docker::Image.build(
@@ -511,7 +513,7 @@ module Kitchen
       end
 
       def delete_image(name)
-        with_retries { @image = ::Docker::Image.get(name, { "platform" => config[:platform] }, docker_connection) }
+        with_retries { @image = ::Docker::Image.get(name, { "platform" => oci_platform(config[:platform]) }, docker_connection) }
         with_retries { @image.remove(force: true) }
       rescue ::Docker::Error
         puts "Image #{name} not found. Nothing to delete."
@@ -674,7 +676,7 @@ module Kitchen
       end
 
       def pull_if_missing(image)
-        return if ::Docker::Image.exist?(registry_image_path(image), { "platform" => config[:platform] }, docker_connection)
+        return if ::Docker::Image.exist?(registry_image_path(image), { "platform" => oci_platform(config[:platform]) }, docker_connection)
 
         pull_image image
       end
@@ -687,8 +689,8 @@ module Kitchen
       def pull_image(image)
         path = registry_image_path(image)
         with_retries do
-          if Docker::Image.exist?(path, { "platform" => config[:platform] }, docker_connection)
-            original_image = Docker::Image.get(path, { "platform" => config[:platform] }, docker_connection)
+          if Docker::Image.exist?(path, { "platform" => oci_platform(config[:platform]) }, docker_connection)
+            original_image = Docker::Image.get(path, { "platform" => oci_platform(config[:platform]) }, docker_connection)
           end
 
           new_image = Docker::Image.create({ "fromImage" => path, "platform" => config[:platform] }, docker_creds_for_image(image), docker_connection)
@@ -697,6 +699,14 @@ module Kitchen
         end
       end
 
+      def oci_platform(platform)
+        if !platform.nil? && platform.include?("/")
+          os, arch = platform.split("/")
+          platform = { os: os, architecture: arch }.to_json
+        end
+        platform
+      end
+
       def runner_container_name
         instance_name.to_s
       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.21.0".freeze
+    DOKKEN_VERSION = "2.21.1".freeze
   end
 end

data/lib/kitchen/helpers.rb

@@ -81,7 +81,7 @@ module Dokken
         RUN chmod 600  /root/.ssh/authorized_keys
 
         EXPOSE 22
-        CMD [ "/usr/sbin/sshd", "-D", "-p", "22", "-o", "UseDNS=no", "-o", "UsePrivilegeSeparation=no", "-o", "MaxAuthTries=60" ]
+        CMD [ "/usr/sbin/sshd", "-D", "-p", "22", "-o", "UseDNS=no", "-o", "MaxAuthTries=60" ]
 
         VOLUME #{resolved_root_path}
         VOLUME /opt/verifier
@@ -117,8 +117,8 @@ module Dokken
       end
     end
 
-    def docker_info
-      ::Docker.url = default_docker_host
+    def docker_info(docker_host)
+      ::Docker.url = docker_host
 
       @docker_info ||= ::Docker.info
     rescue Excon::Error::Socket

data/lib/kitchen/provisioner/dokken.rb

@@ -35,7 +35,9 @@ module Kitchen
       default_config :chef_log_level, "warn"
       default_config :chef_output_format, "doc"
       default_config :profile_ruby, false
-      default_config :docker_info, docker_info
+      default_config :docker_info do |provisioner|
+        docker_info(provisioner[:docker_host_url])
+      end
       default_config :docker_host_url, default_docker_host
 
       # Dokken is weird - the provisioner inherits from ChefZero but does not install

data/lib/kitchen/transport/dokken.rb

@@ -39,7 +39,9 @@ module Kitchen
 
       plugin_version Kitchen::VERSION
 
-      default_config :docker_info, docker_info
+      default_config :docker_info do |transport|
+        docker_info(transport[:docker_host_url])
+      end
       default_config :docker_host_url, default_docker_host
       default_config :read_timeout, 3600
       default_config :write_timeout, 3600

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.21.0
+  version: 2.21.1
 platform: ruby
 authors:
 - Sean OMeara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-16 00:00:00.000000000 Z
+date: 2025-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api