summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Brown <andrew.brown@shopify.com>2016-12-12 12:19:30 -0500
committerAndrew Brown <andrew.brown@shopify.com>2016-12-12 12:26:25 -0500
commitd7785311514ea357a6e238af8049c2564ad216d8 (patch)
tree79a38fe21e2c18b05545ee2c4ca69ea6af3e96d5
parent9530a0027f7769008a850640e192e108a09b45ca (diff)
downloadchef-d7785311514ea357a6e238af8049c2564ad216d8.tar.gz
Make docker? return boolean
Trivial change to ensure node.docker? returns either true or false. Signed-off-by: Andrew Brown <andrew.j.brown@gmail.com>
-rw-r--r--lib/chef/dsl/platform_introspection.rb4
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