From 532a002494963a024d34fb550a8126dd7d4f4933 Mon Sep 17 00:00:00 2001 From: Ilya Lesikov Date: Fri, 17 Jun 2022 15:36:57 +0300 Subject: [PATCH] fix(buildah): improve whether we are in container detection Signed-off-by: Ilya Lesikov --- pkg/util/linux_container.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkg/util/linux_container.go b/pkg/util/linux_container.go index 7f97541bd7..c77cf5966b 100644 --- a/pkg/util/linux_container.go +++ b/pkg/util/linux_container.go @@ -48,9 +48,19 @@ func IsInContainer() bool { return true } + cgroupsData, err := os.ReadFile("/proc/1/cgroup") + if err != nil { + return false + } + // containerd without Docker-daemon - if cgroupsData, err := os.ReadFile("/proc/1/cgroup"); err == nil && - strings.Contains(string(cgroupsData), "/cri-containerd-") { + if strings.Contains(string(cgroupsData), "/cri-containerd-") || + strings.Contains(string(cgroupsData), "/containerd") { + return true + } + + // If in Kubernetes + if strings.Contains(string(cgroupsData), "/kubepods") { return true }