Detect Docker also using /.dockerenv
This commit is contained in:
parent
f848ee3fa2
commit
70a8f589c6
|
@ -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 {
|
||||
|
|
|
@ -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()
|
||||
|
|
Loading…
Reference in New Issue