TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-12-09 17:54:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

hostinfo: detect being run in a container in more ways

Browse Source 
Change-Id: I038ff7705ba232e6cf8dcc9775357ef708d43762
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
(cherry picked from commit 16939f0d56)
This commit is contained in:
Brad Fitzpatrick 2022-09-11 21:45:08 -07:00 committed by Brad Fitzpatrick
parent facdc475bb
commit 0345649d05
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hostinfo/hostinfo.go
View File

@ -183,6 +183,13 @@ func inContainer() bool {
if runtime.GOOS != "linux" { if runtime.GOOS != "linux" {
return false return false
} }
if _, err := os.Stat("/.dockerenv"); err == nil {
return true
}
if _, err := os.Stat("/run/.containerenv"); err == nil {
// See https://github.com/cri-o/cri-o/issues/5461
return true
}
var ret bool var ret bool
lineread.File("/proc/1/cgroup", func(line []byte) error { lineread.File("/proc/1/cgroup", func(line []byte) error {
if mem.Contains(mem.B(line), mem.S("/docker/")) || if mem.Contains(mem.B(line), mem.S("/docker/")) ||