summaryrefslogtreecommitdiff
path: root/lib/chef/dsl
diff options
context:
space:
mode:
authorAndrew Brown <andrew.brown@shopify.com>2016-05-30 13:22:14 -0400
committerAndrew Brown <andrew.brown@shopify.com>2016-05-30 16:14:34 -0400
commit61d1831a9eabd44af6797d49b85ff1c01b71055d (patch)
treefbbd43e642760a8756912c6904197f5edb25c2bd /lib/chef/dsl
parent75ace978d070f2f8923f40c328ea594cd505cafb (diff)
downloadchef-61d1831a9eabd44af6797d49b85ff1c01b71055d.tar.gz
Switch to node attributes for docker detection
Using ::File.exists? makes Travis CI sad due to statically looking for files. We'll use node attributes provided by Ohai instead.
Diffstat (limited to 'lib/chef/dsl')
-rw-r--r--lib/chef/dsl/platform_introspection.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/chef/dsl/platform_introspection.rb b/lib/chef/dsl/platform_introspection.rb
index 4ccdb34981..a0c2d33967 100644
--- a/lib/chef/dsl/platform_introspection.rb
+++ b/lib/chef/dsl/platform_introspection.rb
@@ -254,8 +254,11 @@ class Chef
# === Returns
# true:: if the current node is a docker container
# false:: if the current node is not a docker container
- def docker?(node)
- ::File.exist?("/.dockerinit") || ::File.exist?("/.dockerenv")
+ 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"
end
end