diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-12-12 10:07:32 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-12 10:07:32 -0800 |
| commit | b9177f0ade147c443d4097dd7d427e3592ec3c6a (patch) | |
| tree | 79a38fe21e2c18b05545ee2c4ca69ea6af3e96d5 | |
| parent | 9530a0027f7769008a850640e192e108a09b45ca (diff) | |
| parent | d7785311514ea357a6e238af8049c2564ad216d8 (diff) | |
| download | chef-b9177f0ade147c443d4097dd7d427e3592ec3c6a.tar.gz | |
Merge pull request #5645 from andrewjamesbrown/master
Ensure node.docker? returns boolean
| -rw-r--r-- | lib/chef/dsl/platform_introspection.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/dsl/platform_introspection.rb b/lib/chef/dsl/platform_introspection.rb index a0c2d33967..f99ab970c5 100644 --- a/lib/chef/dsl/platform_introspection.rb +++ b/lib/chef/dsl/platform_introspection.rb @@ -257,8 +257,8 @@ class Chef def docker?(node = run_context.nil? ? nil : run_context.node) # Using "File.exist?('/.dockerinit') || File.exist?('/.dockerenv')" makes Travis sad, # and that makes us sad too. - node && node[:virtualization] && node[:virtualization][:systems] && - node[:virtualization][:systems][:docker] && node[:virtualization][:systems][:docker] == "guest" + !!(node && node[:virtualization] && node[:virtualization][:systems] && + node[:virtualization][:systems][:docker] && node[:virtualization][:systems][:docker] == "guest") end end |