|
 |
a41150 |
From 6831ccb71a7b19c6e5cb970026cbffff39928e2b Mon Sep 17 00:00:00 2001
|
|
|
a41150 |
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
|
|
|
a41150 |
Date: Sun, 1 Dec 2019 08:21:32 +0200
|
|
|
a41150 |
Subject: [PATCH 24/25] docker: Lookup from /proc/self/cgroup too
|
|
|
a41150 |
|
|
|
a41150 |
Refs https://github.com/moby/moby/issues/18355
|
|
|
a41150 |
|
|
|
a41150 |
(cherry picked from commit 57f0c3cc6a7e631f644d67f05b002c6004bb6601)
|
|
|
a41150 |
---
|
|
|
a41150 |
tests/docker/Makefile.am | 1 +
|
|
|
a41150 |
tests/docker/proc/self/cgroup | 13 +++++++++++++
|
|
|
a41150 |
virt-what.in | 3 ++-
|
|
|
a41150 |
3 files changed, 16 insertions(+), 1 deletion(-)
|
|
|
a41150 |
create mode 100644 tests/docker/proc/self/cgroup
|
|
|
a41150 |
|
|
|
a41150 |
diff --git a/tests/docker/Makefile.am b/tests/docker/Makefile.am
|
|
|
a41150 |
index e2a95d8..401f372 100644
|
|
|
a41150 |
--- a/tests/docker/Makefile.am
|
|
|
a41150 |
+++ b/tests/docker/Makefile.am
|
|
|
a41150 |
@@ -24,6 +24,7 @@ EXTRA_DIST = \
|
|
|
a41150 |
.dockerenv \
|
|
|
a41150 |
.dockerinit \
|
|
|
a41150 |
proc/cpuinfo \
|
|
|
a41150 |
+ proc/self/cgroup \
|
|
|
a41150 |
proc/self/status \
|
|
|
a41150 |
sbin/dmidecode \
|
|
|
a41150 |
sbin/uname \
|
|
|
a41150 |
diff --git a/tests/docker/proc/self/cgroup b/tests/docker/proc/self/cgroup
|
|
|
a41150 |
new file mode 100644
|
|
|
a41150 |
index 0000000..5547637
|
|
|
a41150 |
--- /dev/null
|
|
|
a41150 |
+++ b/tests/docker/proc/self/cgroup
|
|
|
a41150 |
@@ -0,0 +1,13 @@
|
|
|
a41150 |
+12:devices:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae
|
|
|
a41150 |
+11:blkio:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae
|
|
|
a41150 |
+10:perf_event:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae
|
|
|
a41150 |
+9:pids:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae
|
|
|
a41150 |
+8:cpuset:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae
|
|
|
a41150 |
+7:rdma:/
|
|
|
a41150 |
+6:hugetlb:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae
|
|
|
a41150 |
+5:net_cls,net_prio:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae
|
|
|
a41150 |
+4:memory:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae
|
|
|
a41150 |
+3:freezer:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae
|
|
|
a41150 |
+2:cpu,cpuacct:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae
|
|
|
a41150 |
+1:name=systemd:/docker/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae
|
|
|
a41150 |
+0::/system.slice/containerd.service
|
|
|
a41150 |
diff --git a/virt-what.in b/virt-what.in
|
|
|
a41150 |
index 900a05d..6330fd0 100644
|
|
|
a41150 |
--- a/virt-what.in
|
|
|
a41150 |
+++ b/virt-what.in
|
|
|
a41150 |
@@ -349,7 +349,8 @@ if ! "$skip_lkvm"; then
|
|
|
a41150 |
fi
|
|
|
a41150 |
|
|
|
a41150 |
# Check for Docker.
|
|
|
a41150 |
-if [ -f "${root}/.dockerenv" ] || [ -f "${root}/.dockerinit" ]; then
|
|
|
a41150 |
+if [ -f "${root}/.dockerenv" ] || [ -f "${root}/.dockerinit" ] || \
|
|
|
a41150 |
+ grep -qF /docker/ "${root}/proc/self/cgroup" 2>/dev/null; then
|
|
|
a41150 |
echo docker
|
|
|
a41150 |
fi
|
|
|
a41150 |
|
|
|
a41150 |
--
|
|
|
a41150 |
2.18.4
|
|
|
a41150 |
|