Merge pull request #15763 from tianon/dind-tmp

Update dind "/tmp" mounting to be optional
This commit is contained in:
Tianon Gravi 2015-08-21 21:14:35 -07:00
commit 5fd15da7da
1 changed files with 4 additions and 2 deletions

View File

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