Detect Docker also using /.dockerenv

shirou · Dec 28, 2022 · 70a8f58 · 70a8f58
1 parent f848ee3
commit 70a8f58
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/internal/common/common.go b/internal/common/common.go
@@ -364,6 +364,10 @@ func HostDev(combineWith ...string) string {
 	return GetEnv("HOST_DEV", "/dev", combineWith...)
 }
 
+func HostRoot(combineWith ...string) string {
+	return GetEnv("HOST_ROOT", "/", combineWith...)
+}
+
 // getSysctrlEnv sets LC_ALL=C in a list of env vars for use when running
 // sysctl commands (see DoSysctrl).
 func getSysctrlEnv(env []string) []string {

diff --git a/internal/common/common_linux.go b/internal/common/common_linux.go
@@ -259,6 +259,11 @@ func VirtualizationWithContext(ctx context.Context) (string, string, error) {
 		}
 	}
 
+	if PathExists(HostRoot(".dockerenv")) {
+		system = "docker"
+		role = "guest"
+	}
+
 	// before returning for the first time, cache the system and role
 	cachedVirtOnce.Do(func() {
 		cachedVirtMutex.Lock()