kitchen-dokken 2.17.3 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca4a37e299f05169d18ddc09aaf05dac0690c0aaf6ae6d4d19833e4c52bea6da
-  data.tar.gz: fbe097fca4cce344f710a8b7821c55512e9c5dd576f7dcd472395a2479a90acb
+  metadata.gz: f73c03e77f7fab51c83c62e31ea41343a58620e8246d6c174a877c752503e1e8
+  data.tar.gz: 2ad555af59f56455551c9927654d400dab573c2c71be7292d4919b5527f46bf4
 SHA512:
-  metadata.gz: 042aa06968c356ef83782bfa36e1001e38a0aac60b0eb797345e0832b2648c1f56c1f8d734c27884cdd4a07f58145df656738e6b8d8a2afe2abe5d1957a90abd
-  data.tar.gz: 9a5ac2a2f805da0306c61edb2e31a7d5b402c83ce037973ac37a9c17d35cd7ca342c549f0406e58992e3382995d61385132b9a095fe3339ec710158d706ed552
+  metadata.gz: 62edea017014a519f4b103bd6bd0572459ab780fc4e6bb544eda21677448ccd07933965499aafbe1d56708b7bff4b50c4b2f29c4ed8cb1f2f365fe01f6fb5468
+  data.tar.gz: fc6c78ecf7227b64354fa9afe7d1706c4082799efc3dfe5a3af604078e41a50316cf094296101e0bf280165705caae15146f232ed601c98b8f8b4337a0b68898

data/lib/kitchen/driver/dokken.rb

@@ -38,6 +38,7 @@ module Kitchen
       default_config :binds, []
       default_config :cap_add, nil
       default_config :cap_drop, nil
+      default_config :cgroupns_host, false
       default_config :chef_image, "chef/chef"
       default_config :chef_version, "latest"
       default_config :data_image, "dokken/kitchen-cache:latest"
@@ -57,6 +58,7 @@ module Kitchen
       default_config :memory_limit, 0
       default_config :network_mode, "dokken"
       default_config :pid_one_command, 'sh -c "trap exit 0 SIGTERM; while :; do sleep 1; done"'
+      default_config :platform, ""
       default_config :ports, nil
       default_config :privileged, false
       default_config :pull_chef_image, true
@@ -135,9 +137,9 @@ module Kitchen
       end
 
       def delete_work_image
-        return unless ::Docker::Image.exist?(work_image, {}, docker_connection)
+        return unless ::Docker::Image.exist?(work_image, { "platform" => config[:platform] }, docker_connection)
 
-        with_retries { @work_image = ::Docker::Image.get(work_image, {}, docker_connection) }
+        with_retries { @work_image = ::Docker::Image.get(work_image, { "platform" => config[:platform] }, docker_connection) }
 
         with_retries do
 
@@ -150,13 +152,14 @@ module Kitchen
 
       def build_work_image(state)
         info("Building work image..")
-        return if ::Docker::Image.exist?(work_image, {}, docker_connection)
+        return if ::Docker::Image.exist?(work_image, { "platform" => config[:platform] }, docker_connection)
 
         begin
           @intermediate_image = ::Docker::Image.build(
             work_image_dockerfile,
             {
               "t" => work_image,
+              "platform" => config[:platform],
             },
             docker_connection
           )
@@ -330,6 +333,9 @@ module Kitchen
         unless self[:entrypoint].to_s.empty?
           config["Entrypoint"] = self[:entrypoint]
         end
+        if self[:cgroupns_host]
+          config["HostConfig"]["CgroupnsMode"] = "host"
+        end
         if self[:userns_host]
           config["HostConfig"]["UsernsMode"] = "host"
         end
@@ -475,7 +481,7 @@ module Kitchen
       end
 
       def delete_image(name)
-        with_retries { @image = ::Docker::Image.get(name, {}, docker_connection) }
+        with_retries { @image = ::Docker::Image.get(name, { "platform" => config[:platform] }, docker_connection) }
         with_retries { @image.remove(force: true) }
       rescue ::Docker::Error
         puts "Image #{name} not found. Nothing to delete."
@@ -547,6 +553,7 @@ module Kitchen
           args["Env"] = [] if args["Env"].nil?
           args["Env"] << "TEST_KITCHEN=1"
           args["Env"] << "CI=#{ENV["CI"]}" if ENV.include? "CI"
+          args["Platform"] = config[:platform]
           info "Creating container #{args["name"]}"
           debug "driver - create_container args #{args}"
           with_retries do
@@ -608,7 +615,7 @@ module Kitchen
       end
 
       def chef_container_name
-        "chef-#{chef_version}"
+        config[:platform] != "" ? "chef-#{chef_version}-" + config[:platform].sub("/", "-") : "chef-#{chef_version}"
       end
 
       def chef_image
@@ -639,7 +646,7 @@ module Kitchen
       end
 
       def pull_if_missing(image)
-        return if ::Docker::Image.exist?(registry_image_path(image), {}, docker_connection)
+        return if ::Docker::Image.exist?(registry_image_path(image), { "platform" => config[:platform] }, docker_connection)
 
         pull_image image
       end
@@ -652,11 +659,11 @@ module Kitchen
       def pull_image(image)
         path = registry_image_path(image)
         with_retries do
-          if Docker::Image.exist?(path, {}, docker_connection)
-            original_image = Docker::Image.get(path, {}, docker_connection)
+          if Docker::Image.exist?(path, { "platform" => config[:platform] }, docker_connection)
+            original_image = Docker::Image.get(path, { "platform" => config[:platform] }, docker_connection)
           end
 
-          new_image = Docker::Image.create({ "fromImage" => path }, docker_creds_for_image(image), docker_connection)
+          new_image = Docker::Image.create({ "fromImage" => path, "platform" => config[:platform] }, 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.17.3".freeze
+    DOKKEN_VERSION = "2.18.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.17.3
+  version: 2.18.0
 platform: ruby
 authors:
 - Sean OMeara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-20 00:00:00.000000000 Z
+date: 2022-12-22 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.3
+rubygems_version: 3.3.16
 signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver for Docker & Chef Infra optimized for rapid testing