From f006710419d45db8c6d2cd14297d231ffa776793 Mon Sep 17 00:00:00 2001 From: ejose19 <8742215+ejose19@users.noreply.github.com> Date: Sat, 3 Jul 2021 10:36:04 -0300 Subject: [PATCH] refactor: adjust bpfd container runtime detection --- pkg/util/proc.go | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/pkg/util/proc.go b/pkg/util/proc.go index 4436d00856..c1c1c19741 100644 --- a/pkg/util/proc.go +++ b/pkg/util/proc.go @@ -119,6 +119,34 @@ func GetContainerRuntime(tgid, pid int) ContainerRuntime { return runtime } + // Check for container specific files + runtime = detectContainerFiles() + if runtime != RuntimeNotFound { + return runtime + } + + 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 osFileExists(files[i].location) { + return files[i].runtime + } + } + return RuntimeNotFound }