Merge pull request #4553 from werf/fix-improve-container-detection

fix(buildah): improve whether we are in container detection
werf · Jun 17, 2022 · c9b39c8 · c9b39c8
2 parents 603944f + 532a002
commit c9b39c8
Showing 1 changed file with 12 additions and 2 deletions.
diff --git 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
 	}