Detect podman container environment.

ser-io · ser-io · commit 9426ceb3eaff · 2026-06-16T18:44:06.000Z
Bug: b/523379344
diff --git a/base/cvd/cuttlefish/common/libs/utils/container.cpp b/base/cvd/cuttlefish/common/libs/utils/container.cpp
@@ -30,11 +30,13 @@ bool IsRunningInDocker() {
   return FileExists(docker_env_path) || DirectoryExists(docker_env_path);
 }
 
+bool IsRunningInPodman() { return FileExists("/run/.containerenv"); }
+
 }  // namespace
 
 bool IsRunningInContainer() {
   // TODO: add more if we support other containers than docker
-  return IsRunningInDocker();
+  return IsRunningInDocker() || IsRunningInPodman();
 }
 
 }  // namespace cuttlefish

Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,13 @@ bool IsRunningInDocker() {`
`30`	`30`	`return FileExists(docker_env_path) \|\| DirectoryExists(docker_env_path);`
`31`	`31`	`}`
`32`	`32`
	`33`	`+bool IsRunningInPodman() { return FileExists("/run/.containerenv"); }`
	`34`	`+`
`33`	`35`	`} // namespace`
`34`	`36`
`35`	`37`	`bool IsRunningInContainer() {`
`36`	`38`	`// TODO: add more if we support other containers than docker`
`37`		`- return IsRunningInDocker();`
	`39`	`+ return IsRunningInDocker() \|\| IsRunningInPodman();`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`} // namespace cuttlefish`