kitchen-dokken 2.8.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b746f7ad067bdc9c5ec6654a8445b95bd0ba32eb510066efb631b2c2983477fb
-  data.tar.gz: e4de65e4624e7b30ca0a4d229d835cba390c17faab88df0707a8406ab0520598
+  metadata.gz: 9457c866ed76959da525c5c6ff2cf79ec23ce6f1bc0b3b4f19a1d65dbb8c53d1
+  data.tar.gz: 12416b24465f12771c00ff3d702f0c2283a763e113710da7f5fa43b8f4c21ae5
 SHA512:
-  metadata.gz: ed977a55991a7fd959d2d484e1789afe4e8047bdb7356ea9eb789c43c2763cdfe25a483f05287e3b055b608d402d27e88bc25a1dff15a806ebe85f512960a209
-  data.tar.gz: '079c039920015e6b022379113da30e134d3217399df8d1085bd2f4af5cc1eb430641d4d63f117e988773ae629eb57d292402e6db7397bf4070a0b2d661f92356'
+  metadata.gz: 6b1bd8719579b19eca0d091b713c00d94cdfd08e4f3d4a5c79caae06301bfd0bc0f2e84dac691f4a55824e7e0a87a6bf7cc5cce1c3b29c35b9b4414aa2cf687a
+  data.tar.gz: b943f80b7f0664155366080e2a9fe4d3b07e897b77c396d87d31d103c32935d16a7b44c75bf2525f729b028d2bb8bb7a77f8c9f2e98dd2a57ae7e67cb03fc326

data/lib/kitchen/driver/dokken.rb

@@ -61,6 +61,7 @@ module Kitchen
       default_config :userns_host, false
       default_config :pull_platform_image, true
       default_config :pull_chef_image, true
+      default_config :memory_limit, 0
 
       # (see Base#create)
       def create(state)
@@ -300,6 +301,7 @@ module Kitchen
             'NetworkMode' => self[:network_mode],
             'PortBindings' => port_bindings,
             'Tmpfs' => dokken_tmpfs,
+            'Memory' => self[:memory_limit],
           },
           'NetworkingConfig' => {
             'EndpointsConfig' => {
@@ -436,9 +438,9 @@ module Kitchen
       rescue
         with_retries do
           begin
-            args['env'] = [] if args['env'].nil?
-            args['env'] << 'TEST_KITCHEN=1'
-            args['env'] << "CI=#{ENV['CI']}" if ENV.include? 'CI'
+            args['Env'] = [] if args['Env'].nil?
+            args['Env'] << 'TEST_KITCHEN=1'
+            args['Env'] << "CI=#{ENV['CI']}" if ENV.include? 'CI'
             info "Creating container #{args['name']}"
             debug "driver - create_container args #{args}"
             with_retries do

data/lib/kitchen/driver/dokken_version.rb

@@ -18,6 +18,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = '2.8.0'.freeze
+    DOKKEN_VERSION = '2.10.0'.freeze
   end
 end

data/lib/kitchen/provisioner/dokken.rb

@@ -30,7 +30,7 @@ module Kitchen
       plugin_version Kitchen::VERSION
 
       default_config :root_path, '/opt/kitchen'
-      default_config :chef_binary, '/opt/chef/embedded/bin/chef-client'
+      default_config :chef_binary, '/opt/chef/bin/chef-client'
       default_config :chef_options, ' -z'
       default_config :chef_log_level, 'warn'
       default_config :chef_output_format, 'doc'
@@ -50,10 +50,12 @@ module Kitchen
         driver = provisioner.instance.driver
         driver[:chef_version]
       end
+      default_config :clean_dokken_sandbox, true
 
       # (see Base#call)
       def call(state)
         create_sandbox
+        write_run_command(run_command)
         instance.transport.connection(state) do |conn|
           if remote_docker_host?
             info("Transferring files to #{instance.to_str}")
@@ -62,7 +64,7 @@ module Kitchen
 
           conn.execute(prepare_command)
           conn.execute_with_retry(
-            run_command,
+            "sh #{config[:root_path]}/run_command",
             config[:retry_on_exit_code],
             config[:max_retries],
             config[:wait_for_retry]
@@ -71,6 +73,7 @@ module Kitchen
       rescue Kitchen::Transport::TransportFailed => ex
         raise ActionFailed, ex.message
       ensure
+        return unless config[:clean_dokken_sandbox]
         cleanup_dokken_sandbox
       end
 
@@ -103,6 +106,12 @@ module Kitchen
         cmd << " -F #{config[:chef_output_format]}"
         cmd << ' -c /opt/kitchen/client.rb'
         cmd << ' -j /opt/kitchen/dna.json'
+
+        chef_cmd(cmd)
+      end
+
+      def write_run_command(command)
+        File.write("#{dokken_kitchen_sandbox}/run_command", command)
       end
 
       def runner_container_name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Sean OMeara
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -75,7 +75,7 @@ homepage: https://github.com/someara/kitchen-dokken
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,8 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver that talks to the Docker Remote API and uses Volumes
   to produce sparse container images