kitchen-dokken 2.1.9 → 2.1.10
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/CHANGELOG.md +3 -0
- data/lib/kitchen/driver/dokken.rb +1 -0
- data/lib/kitchen/driver/dokken_version.rb +1 -1
- data/lib/kitchen/helpers.rb +5 -0
- data/lib/kitchen/provisioner/dokken.rb +1 -0
- data/lib/kitchen/transport/dokken.rb +1 -0
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0571ca8dbfba7cae0fad6b8443ec0abe1e8bf0b3
|
|
4
|
+
data.tar.gz: 4f5c87a8ffad2043a354f89ec6b7ffbb90af00b6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 65cd7ad6703ae3c74354e722333c224de58f5cf5d387b73ac2884f340f4dddfaf11cd0d3e25c6f3fdb795bcd7c175c3c9f0e4db9f7478d3509d8577970e829eb
|
|
7
|
+
data.tar.gz: e904d1e6409a57359bdea3b8aac4cc9690a45a7a93874b3610b13351f608ac66d4d793998b2d482ab9866c142ca458061139d15ccb5c8cc7337e1af2a081479a
|
data/CHANGELOG.md
CHANGED
|
@@ -41,6 +41,7 @@ module Kitchen
|
|
|
41
41
|
default_config :data_image, 'dokken/kitchen-cache:latest'
|
|
42
42
|
default_config :dns, nil
|
|
43
43
|
default_config :dns_search, nil
|
|
44
|
+
default_config :docker_info, docker_info
|
|
44
45
|
default_config :docker_host_url, default_docker_host
|
|
45
46
|
default_config :forward, nil
|
|
46
47
|
default_config :hostname, nil
|
data/lib/kitchen/helpers.rb
CHANGED
|
@@ -88,6 +88,10 @@ EOF
|
|
|
88
88
|
end
|
|
89
89
|
end
|
|
90
90
|
|
|
91
|
+
def docker_info
|
|
92
|
+
@docker_info ||= ::Docker.info
|
|
93
|
+
end
|
|
94
|
+
|
|
91
95
|
def dokken_create_sandbox
|
|
92
96
|
info("Creating kitchen sandbox at #{dokken_kitchen_sandbox}")
|
|
93
97
|
FileUtils.mkdir_p(dokken_kitchen_sandbox)
|
|
@@ -142,6 +146,7 @@ EOF
|
|
|
142
146
|
end
|
|
143
147
|
|
|
144
148
|
def remote_docker_host?
|
|
149
|
+
return false if config[:docker_info]['OperatingSystem'].include?('Boot2Docker')
|
|
145
150
|
return true if config[:docker_host_url] =~ /^tcp:/
|
|
146
151
|
false
|
|
147
152
|
end
|
|
@@ -35,6 +35,7 @@ module Kitchen
|
|
|
35
35
|
default_config :chef_options, ' -z'
|
|
36
36
|
default_config :chef_log_level, 'warn'
|
|
37
37
|
default_config :chef_output_format, 'doc'
|
|
38
|
+
default_config :docker_info, docker_info
|
|
38
39
|
default_config :docker_host_url, default_docker_host
|
|
39
40
|
|
|
40
41
|
# (see Base#call)
|
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.1.
|
|
4
|
+
version: 2.1.10
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Sean OMeara
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-06-
|
|
11
|
+
date: 2017-06-14 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: test-kitchen
|