Merge branch '2.0.x'

mbhave · mbhave · commit 8a94c5581c09 · 2018-10-16T16:39:32.000-07:00
diff --git a/ci/images/docker-lib.sh b/ci/images/docker-lib.sh
@@ -1,3 +1,5 @@
+# Ref: https://github.com/concourse/docker-image-resource/blob/master/assets/common.sh
+
 sanitize_cgroups() {
   mkdir -p /sys/fs/cgroup
   mountpoint -q /sys/fs/cgroup || \

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# Ref: https://github.com/concourse/docker-image-resource/blob/master/assets/common.sh`
	`2`	`+`
`1`	`3`	`sanitize_cgroups() {`
`2`	`4`	`mkdir -p /sys/fs/cgroup`
`3`	`5`	`mountpoint -q /sys/fs/cgroup \|\| \`