Generalize running_in_container function

emalm · Brandon Shroyer · commit 8b01bbd9f112 · 2016-12-21T11:43:57.000-05:00
This change allows jobs to run correctly in garden-runc containers as well as in the previously supported garden-linux and docker containers. [finishes #136407357, closes #242]
diff --git a/src/pid_utils.sh b/src/pid_utils.sh
@@ -182,5 +182,6 @@ file_must_include() {
 }
 
 running_in_container() {
-  grep -q -E '/instance|/docker/' /proc/self/cgroup
+  # look for a non-root cgroup
+  grep --quiet --invert-match ':/$' /proc/self/cgroup
 }

Original file line number	Diff line number	Diff line change
`@@ -182,5 +182,6 @@ file_must_include() {`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`running_in_container() {`
`185`		`- grep -q -E '/instance\|/docker/' /proc/self/cgroup`
	`185`	`+ # look for a non-root cgroup`
	`186`	`+ grep --quiet --invert-match ':/$' /proc/self/cgroup`
`186`	`187`	`}`