kitchen-dokken 2.21.4 → 2.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6b61f4f92be56f902d431679b3c4285ccfa4e534ed8046a4751050f4bdaf53a
-  data.tar.gz: 9c2ebe65fe043b0ab9f7c94f3db8cc9eed981577d8eae25d5239108aed1e5b98
+  metadata.gz: edaff5e00aeab38df7da84c6ffe4ac4c9e49150519962b839da9f87180b5e69a
+  data.tar.gz: b48d6f2a140ba5e3fe4303dd1279a9b891f56905f389de9b741f1343b8b4be0c
 SHA512:
-  metadata.gz: 12bd55204781a9866c80365c18e68864483e4ce01785cf9c88524c3c6ed77e86114837e0af7f9ab361a7b653069b88da5bbc729f17058f900943a527486151a5
-  data.tar.gz: 034c31fbcff62ccc5aa8b0fa3c98dc7b0524087ccdc78cf4a02e4ba689f3180a452a966b56df433c4748a71b6cbed970c6d3a173fb1a2843443c30ca24af4914
+  metadata.gz: db09d21bc0b0cac97916663fa49731b0db96685ae195714893f1d0936c3e856bab4136cbbd69a7b597e9651058e8784e37f51419650983774f22bbc95a43fb71
+  data.tar.gz: b66adcd004984b3daaa76cc4f9522515d4df6e1d8fa7983abea686a648aa68c4e912bbb03c53674c45f93b8d6fbd268994d793ff9979499b216e1ab14f59c31f

data/kitchen-dokken.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 3.2"
 
   spec.add_dependency "docker-api", ">= 1.33", "< 3"
+  spec.add_dependency "kitchen-omnibus-chef", ">= 1.0"
   spec.add_dependency "lockfile", "~> 2.1"
-  spec.add_dependency "test-kitchen", ">= 1.15", "< 4"
+  spec.add_dependency "test-kitchen", ">= 1.15", "< 5"
 end

data/lib/kitchen/driver/dokken.rb

@@ -42,6 +42,7 @@ module Kitchen
       default_config :chef_image, "chef/chef"
       default_config :chef_version, "latest"
       default_config :data_image, "dokken/kitchen-cache:latest"
+      default_config :data_ssh_port, nil
       default_config :dns, nil
       default_config :dns_search, nil
       default_config :docker_host_url, default_docker_host
@@ -374,8 +375,8 @@ module Kitchen
           # locally built image, must use short-name
           "Image" => short_image_path(data_image),
           "HostConfig" => {
-            "PortBindings" => port_bindings,
-            "PublishAllPorts" => true,
+            "PortBindings" => data_port_bindings,
+            "PublishAllPorts" => self[:data_ssh_port].nil?,
             "NetworkMode" => "bridge",
           },
         }
@@ -678,6 +679,27 @@ module Kitchen
         config[:data_image]
       end
 
+      def data_port_bindings
+        return port_bindings unless config[:data_ssh_port]
+
+        # If data_ssh_port is specified, use it for SSH port mapping
+        ssh_port_binding = {
+          "22/tcp" => [
+            {
+              "HostIp" => "0.0.0.0",
+              "HostPort" => config[:data_ssh_port].to_s,
+            },
+          ],
+        }
+
+        # Merge with any existing port bindings
+        if port_bindings
+          port_bindings.merge(ssh_port_binding)
+        else
+          ssh_port_binding
+        end
+      end
+
       def platform_image
         config[:image] || platform_image_from_name
       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.4".freeze
+    DOKKEN_VERSION = "2.22.1".freeze
   end
 end

data/lib/kitchen/provisioner/dokken.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 
 require "kitchen"
-require "kitchen/provisioner/chef_zero"
+require "kitchen/provisioner/chef_infra"
 require_relative "../helpers"
 
 include Dokken::Helpers
@@ -24,7 +24,7 @@ include Dokken::Helpers
 module Kitchen
   module Provisioner
     # @author Sean OMeara <sean@sean.io>
-    class Dokken < Kitchen::Provisioner::ChefZero
+    class Dokken < Kitchen::Provisioner::ChefInfra
       kitchen_provisioner_api_version 2
 
       plugin_version Kitchen::VERSION
@@ -40,14 +40,14 @@ module Kitchen
       end
       default_config :docker_host_url, default_docker_host
 
-      # Dokken is weird - the provisioner inherits from ChefZero but does not install
+      # Dokken is weird - the provisioner inherits from ChefInfra but does not install
       # chef-client. The version of chef used is customized by users in the driver
       # section since it is just downloading a specific Docker image of Chef Client.
       # In order to get the license-acceptance code working though (which depends on
       # the product_version from the provisioner) we need to copy the value from the
       # driver and set it here. If we remove this, users will set their chef_version
       # to 14 in the driver and still get prompted for license acceptance because
-      # the ChefZero provisioner defaults product_version to 'latest'.
+      # the ChefInfra provisioner defaults product_version to 'latest'.
       default_config :product_name, "chef"
       default_config :product_version do |provisioner|
         driver = provisioner.instance.driver
@@ -99,7 +99,7 @@ module Kitchen
 
       private
 
-      # patching Kitchen::Provisioner::ChefZero#run_command
+      # patching Kitchen::Provisioner::ChefInfra#run_command
       def run_command
         validate_config
         cmd = config[:chef_binary]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.21.4
+  version: 2.22.1
 platform: ruby
 authors:
 - Sean OMeara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-15 00:00:00.000000000 Z
+date: 2026-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: kitchen-omnibus-chef
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: lockfile
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +67,7 @@ dependencies:
         version: '1.15'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +77,7 @@ dependencies:
         version: '1.15'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 description: A Test Kitchen Driver for Docker & Chef Infra optimized for rapid testing
   using Chef Infra docker images
 email: