From 715f75985bbf9ac5456fccd0d272c54954c70492 Mon Sep 17 00:00:00 2001
From: ejose19 <8742215+ejose19@users.noreply.github.com>
Date: Thu, 6 May 2021 22:06:00 -0300
Subject: [PATCH] improve container detection using container specific files

---
 proc/proc.go | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/proc/proc.go b/proc/proc.go
index f2357ca..d48d479 100644
--- a/proc/proc.go
+++ b/proc/proc.go
@@ -150,6 +150,12 @@ func GetContainerRuntime(tgid, pid int) ContainerRuntime {
 		return runtime
 	}
 
+	// Check for container specific files
+	runtime = detectContainerFiles()
+	if runtime != RuntimeNotFound {
+		return runtime
+	}
+
 	return RuntimeNotFound
 }
 
@@ -167,6 +173,28 @@ func getContainerRuntime(input string) ContainerRuntime {
 	return RuntimeNotFound
 }
 
+// Related implementation: https://github.com/systemd/systemd/blob/6604fb0207ee10e8dc05d67f6fe45de0b193b5c4/src/basic/virt.c#L523-L549
+func detectContainerFiles() ContainerRuntime {
+	files := []struct {
+		runtime  ContainerRuntime
+		location string
+	}{
+		// https://github.com/containers/podman/issues/6192
+		// https://github.com/containers/podman/issues/3586#issuecomment-661918679
+		{RuntimePodman, "/run/.containerenv"},
+		// https://github.com/moby/moby/issues/18355
+		{RuntimeDocker, "/.dockerenv"},
+	}
+
+	for i := range files {
+		if fileExists(files[i].location) {
+			return files[i].runtime
+		}
+	}
+
+	return RuntimeNotFound
+}
+
 // GetContainerID returns the container ID for a process if it's running in a container.
 // If pid is less than one, it returns the container ID for "self".
 func GetContainerID(tgid, pid int) string {