Merge pull request #15763 from tianon/dind-tmp

Update dind "/tmp" mounting to be optional
Upstream-commit: 5fd15da7daad56c07842ecda082e9c5d0e6ff620
Component: engine

components/engine/hack/dind

@@ -105,8 +105,10 @@ if ! grep -qw devices /proc/1/cgroup; then
 	echo >&2 'WARNING: it looks like the "devices" cgroup is not mounted.'
 fi
 
-# Mount /tmp
-mount -t tmpfs none /tmp
+# Mount /tmp (conditionally)
+if ! mountpoint -q /tmp; then
+	mount -t tmpfs none /tmp
+fi
 
 if [ $# -gt 0 ]; then
 	exec "$@"