OrgGo/shirou_gopsutil
1
0
Fork 0
mirror of https://github.com/shirou/gopsutil.git synced 2025-04-29 13:49:21 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1400 from scop/dockerenv

Browse Source 
Detect Docker also using /.dockerenv
This commit is contained in:
shirou 2022-12-30 17:10:51 +09:00 committed by GitHub
commit ca886f9316
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/common/common.go
View File

@ -364,6 +364,10 @@ func HostDev(combineWith ...string) string {
return GetEnv("HOST_DEV", "/dev", combineWith...) 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 // getSysctrlEnv sets LC_ALL=C in a list of env vars for use when running
// sysctl commands (see DoSysctrl). // sysctl commands (see DoSysctrl).
func getSysctrlEnv(env []string) []string { func getSysctrlEnv(env []string) []string {

5
internal/common/common_linux.go
View File

@ -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 // before returning for the first time, cache the system and role
cachedVirtOnce.Do(func() { cachedVirtOnce.Do(func() {
cachedVirtMutex.Lock() cachedVirtMutex.Lock()