From ec269ac72f473795bff0e394888d859a2b7d39d8 Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Thu, 9 Jul 2020 22:51:34 +0300 Subject: [PATCH] CIFuzz: switch to systemd-detect-virt to detect docker (#4101) Closes https://github.com/google/oss-fuzz/issues/4093 --- infra/utils.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/infra/utils.py b/infra/utils.py index 17cc2379f..4685c6030 100644 --- a/infra/utils.py +++ b/infra/utils.py @@ -89,15 +89,14 @@ def get_fuzz_targets(path): def get_container_name(): """Gets the name of the current docker container you are in. - /proc/self/cgroup can be used to check control groups e.g. Docker. - See: https://docs.docker.com/config/containers/runmetrics/ for more info. Returns: Container name or None if not in a container. """ - with open('/proc/self/cgroup') as file_handle: - if 'docker' not in file_handle.read(): - return None + result = subprocess.run(['systemd-detect-virt', '-c'], + stdout=subprocess.PIPE).stdout + if b'docker' not in result: + return None with open('/etc/hostname') as file_handle: return file_handle.read().strip()