Detect docker properly even if it's within virtualization

Docker is docker even if it is within other things.

Closes #1626

Signed-off-by: Phil Dibowitz <phil@ipom.com>

1 files changed, 12 insertions, 0 deletions

diff --git a/spec/unit/plugins/linux/virtualization_spec.rb b/spec/unit/plugins/linux/virtualization_spec.rb
index 3e29533c..2466dbf2 100644
--- a/spec/unit/plugins/linux/virtualization_spec.rb
+++ b/spec/unit/plugins/linux/virtualization_spec.rb
@@ -674,6 +674,18 @@ describe Ohai::System, "Linux virtualization platform" do
       expect(plugin[:virtualization][:systems][:docker]).to eq("guest")
     end
 
+    it "sets virtualization if /.dockerenv exists even if /proc/self/cgroup exists" do
+      allow(plugin).to receive(:file_exist?).with("/proc/self/cgroup").and_return(true)
+      allow(plugin).to receive(:file_read).with("/proc/self/cgroup").and_return("")
+      allow(plugin).to receive(:file_read).with("/proc/1/environ").and_return("")
+      allow(plugin).to receive(:file_exist?).with("/.dockerenv").and_return(true)
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("docker")
+      expect(plugin[:virtualization][:role]).to eq("guest")
+      expect(plugin[:virtualization][:systems][:docker]).to eq("guest")
+    end
+
+
     it "sets virtualization if /.dockerinit exists" do
       allow(plugin).to receive(:file_exist?).with("/.dockerinit").and_return(true)
       plugin.run