kitchen-dokken 2.6.8 → 2.6.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/kitchen/driver/dokken.rb +2 -1
- data/lib/kitchen/driver/dokken_version.rb +1 -1
- data/lib/kitchen/provisioner/dokken.rb +14 -0
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 642973e3a66d740cdc8812cf3e18791ae5fdabb090f3720763d27a6ee3410f8a
|
|
4
|
+
data.tar.gz: 7970f4153b4751277c3ebfd45c4b1a6a34fd4750239ba23b4931e09af940c227
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3508c2208a7c1a7b2238f1af03e57ab44b7ce811ae3ca1a7a371a42db7254bfb71faca849367ef6001e35ae6ba32f23c9dbdf7d79eb08758ed6635f33616b732
|
|
7
|
+
data.tar.gz: 3d31946c04e037072e4fcc1891a3b624e1d7fb7520f87d7de40d469a0d1787e90ae7b4c983101d433a205c0be4861cc75b0fbacceca757f80eb03de719d83225
|
|
@@ -58,6 +58,7 @@ module Kitchen
|
|
|
58
58
|
default_config :tmpfs, {}
|
|
59
59
|
default_config :volumes, nil
|
|
60
60
|
default_config :write_timeout, 3600
|
|
61
|
+
default_config :pull_platform_image, true
|
|
61
62
|
|
|
62
63
|
# (see Base#create)
|
|
63
64
|
def create(state)
|
|
@@ -386,7 +387,7 @@ module Kitchen
|
|
|
386
387
|
|
|
387
388
|
def pull_platform_image
|
|
388
389
|
debug "driver - pulling #{chef_image} #{repo(platform_image)} #{tag(platform_image)}"
|
|
389
|
-
pull_image platform_image
|
|
390
|
+
config[:pull_platform_image] ? pull_image(platform_image) : pull_if_missing(platform_image)
|
|
390
391
|
end
|
|
391
392
|
|
|
392
393
|
def pull_chef_image
|
|
@@ -37,6 +37,20 @@ module Kitchen
|
|
|
37
37
|
default_config :docker_info, docker_info
|
|
38
38
|
default_config :docker_host_url, default_docker_host
|
|
39
39
|
|
|
40
|
+
# Dokken is weird - the provisioner inherits from ChefZero but does not install
|
|
41
|
+
# chef-client. The version of chef used is customized by users in the driver
|
|
42
|
+
# section since it is just downloading a specific Docker image of Chef Client.
|
|
43
|
+
# In order to get the license-acceptance code working though (which depends on
|
|
44
|
+
# the product_version from the provisioner) we need to copy the value from the
|
|
45
|
+
# driver and set it here. If we remove this, users will set their chef_version
|
|
46
|
+
# to 14 in the driver and still get prompted for license acceptance because
|
|
47
|
+
# the ChefZero provisioner defaults product_version to 'latest'.
|
|
48
|
+
default_config :product_name, 'chef'
|
|
49
|
+
default_config :product_version do |provisioner|
|
|
50
|
+
driver = provisioner.instance.driver
|
|
51
|
+
driver[:chef_version]
|
|
52
|
+
end
|
|
53
|
+
|
|
40
54
|
# (see Base#call)
|
|
41
55
|
def call(state)
|
|
42
56
|
create_sandbox
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: kitchen-dokken
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.6.
|
|
4
|
+
version: 2.6.9
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Sean OMeara
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-
|
|
11
|
+
date: 2019-05-23 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: docker-api
|