kitchen-dokken 2.6.8 → 2.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1a5ce770e7c2c74257a1e33147dec2b2a693e0a265f516bafc87b4acf09c460
-  data.tar.gz: 7c1fa1eb07842721dfd72362c5c6dda9b2acb86deae54eea3c46b1dd230917d8
+  metadata.gz: 642973e3a66d740cdc8812cf3e18791ae5fdabb090f3720763d27a6ee3410f8a
+  data.tar.gz: 7970f4153b4751277c3ebfd45c4b1a6a34fd4750239ba23b4931e09af940c227
 SHA512:
-  metadata.gz: e57f9c8c6f0a104ab1ecc50ad4b1660af9104b326db55e3e66af4fda0a879763f1dd3264a0d0860860ed3a6c6180ab7d178f0b9d6163b300a0f1d5673029aefe
-  data.tar.gz: c8f5ca66e58bfeb1a4a388c9d1b765a04b9428830e2e0a76eabd680eb19d383896f7a89f1d2d212470f3463d5f000109691ad44ca01526aea7a25d3089177a38
+  metadata.gz: 3508c2208a7c1a7b2238f1af03e57ab44b7ce811ae3ca1a7a371a42db7254bfb71faca849367ef6001e35ae6ba32f23c9dbdf7d79eb08758ed6635f33616b732
+  data.tar.gz: 3d31946c04e037072e4fcc1891a3b624e1d7fb7520f87d7de40d469a0d1787e90ae7b4c983101d433a205c0be4861cc75b0fbacceca757f80eb03de719d83225

data/lib/kitchen/driver/dokken.rb

@@ -58,6 +58,7 @@ module Kitchen
       default_config :tmpfs, {}
       default_config :volumes, nil
       default_config :write_timeout, 3600
+      default_config :pull_platform_image, true
 
       # (see Base#create)
       def create(state)
@@ -386,7 +387,7 @@ module Kitchen
 
       def pull_platform_image
         debug "driver - pulling #{chef_image} #{repo(platform_image)} #{tag(platform_image)}"
-        pull_image platform_image
+        config[:pull_platform_image] ? pull_image(platform_image) : pull_if_missing(platform_image)
       end
 
       def pull_chef_image

data/lib/kitchen/driver/dokken_version.rb

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

data/lib/kitchen/provisioner/dokken.rb

@@ -37,6 +37,20 @@ module Kitchen
       default_config :docker_info, docker_info
       default_config :docker_host_url, default_docker_host
 
+      # Dokken is weird - the provisioner inherits from ChefZero 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'.
+      default_config :product_name, 'chef'
+      default_config :product_version do |provisioner|
+        driver = provisioner.instance.driver
+        driver[:chef_version]
+      end
+
       # (see Base#call)
       def call(state)
         create_sandbox

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.6.8
+  version: 2.6.9
 platform: ruby
 authors:
 - Sean OMeara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-19 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api