kitchen-dokken 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 007cf9c4b9301c8ea7d351ef74c72eaa3410adfc
-  data.tar.gz: 3b5948b479f7e56cf32175d65dca46b03c2456f4
+  metadata.gz: a9bab02abb12ef02b92221d1ec0904c62a44d7f3
+  data.tar.gz: 503fb7e3f4d7747537d7b60904eff477d684e14b
 SHA512:
-  metadata.gz: a9490504b7c0b0d9df60ea45e949437143ae3917f6e29b016b98794dfdbe4f1cefaf081e2b074f992b778b8d28981d7a5e6a6d00a7c73d736352db45b3703475
-  data.tar.gz: 796e7023b5fe41aaf1916891b910efae60e505fe41d563b78bb1499231ebf3720b48f0bea2450be98e067660ba2ad2aa3247ca5605131e4010a1b89fb1b9ef75
+  metadata.gz: 23576544a00c14affc5b9fecac94852c6181d9fdec7fcbb482e70ba99116d10e1629a075a5296ae3bac304447d4a7595fb5909202c022e2f44b020882c80f4a1
+  data.tar.gz: aeb0cc865e948767ea6e5e9c9246069b7dc79ff1220100de736f56176efeacb31305562ab1439b7b9c35177f37f550872bc1747e931771af40b3b1dc8024ab56

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Dokken Changelog
 
+# 2.6.0
+- Support for testing without provisioner converging
+- entrypoint config
+
 # 2.5.1
 - re-adding boot2docker detection
 

data/lib/kitchen/driver/dokken.rb

@@ -43,6 +43,8 @@ module Kitchen
       default_config :dns, nil
       default_config :dns_search, nil
       default_config :docker_info, docker_info
+      default_config :entrypoint, nil
+      default_config :env, nil
       default_config :ports, nil
       default_config :docker_host_url, default_docker_host
       default_config :hostname, 'dokken'
@@ -150,10 +152,14 @@ module Kitchen
       end
 
       def work_image_dockerfile
-        from = "FROM #{platform_image}"
-        custom = ['RUN /bin/sh -c "echo Built with Test Kitchen"']
-        Array(config[:intermediate_instructions]).each { |c| custom << c }
-        [from, custom].join("\n")
+        dockerfile_contents = [
+          "FROM #{platform_image}",
+          "LABEL X-Built-By=kitchen-dokken X-Built-From=#{platform_image}"
+        ]
+        Array(config[:intermediate_instructions]).each { |c|
+          dockerfile_contents << c
+        }
+        dockerfile_contents.join("\n")
       end
 
       def save_misc_state(state)
@@ -248,6 +254,7 @@ module Kitchen
           'Cmd' => Shellwords.shellwords(self[:pid_one_command]),
           'Image' => "#{repo(work_image)}:#{tag(work_image)}",
           'Hostname' => self[:hostname],
+          'Env' => self[:env],
           'ExposedPorts' => exposed_ports,
           'Volumes' => dokken_volumes,
           'HostConfig' => {
@@ -271,6 +278,9 @@ module Kitchen
             },
           },
         }
+        unless self[:entrypoint].to_s.length == 0
+          config.merge!('Entrypoint' => self[:entrypoint])
+        end
         runner_container = run_container(config)
         state[:runner_container] = runner_container.json
       end

data/lib/kitchen/driver/dokken_version.rb

@@ -19,6 +19,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = '2.5.1'.freeze
+    DOKKEN_VERSION = '2.6.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Sean OMeara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-02 00:00:00.000000000 Z
+date: 2017-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen