Browse code

mkimage: use /var/tmp by default instead of /tmp

Additionally, this can be overridden by setting the TMPDIR variable,
like this was already the case for the generic `mkimage.sh` script.

As explained in #6456, the rationale to use `/var/tmp` instead of `/tmp`
is that `/tmp` is often a small tmpfs filesystem with more restricted
rights.

Docker-DCO-1.1-Signed-off-by: Vincent Bernat <vincent@bernat.im> (github: vincentbernat)

Vincent Bernat authored on 2014/06/27 21:43:12
Showing 8 changed files
... ...
@@ -13,8 +13,8 @@ usage() {
13 13
 }
14 14
 
15 15
 tmp() {
16
-	TMP=$(mktemp -d /tmp/alpine-docker-XXXXXXXXXX)
17
-	ROOTFS=$(mktemp -d /tmp/alpine-docker-rootfs-XXXXXXXXXX)
16
+	TMP=$(mktemp -d ${TMPDIR:-/var/tmp}/alpine-docker-XXXXXXXXXX)
17
+	ROOTFS=$(mktemp -d ${TMPDIR:-/var/tmp}/alpine-docker-rootfs-XXXXXXXXXX)
18 18
 	trap "rm -rf $TMP $ROOTFS" EXIT TERM INT
19 19
 }
20 20
 
... ...
@@ -14,7 +14,7 @@ hash expect &>/dev/null || {
14 14
     exit 1
15 15
 }
16 16
 
17
-ROOTFS=$(mktemp -d /tmp/rootfs-archlinux-XXXXXXXXXX)
17
+ROOTFS=$(mktemp -d ${TMPDIR:-/var/tmp}/rootfs-archlinux-XXXXXXXXXX)
18 18
 chmod 755 $ROOTFS
19 19
 
20 20
 # packages to ignore for space savings
... ...
@@ -14,7 +14,7 @@ BUSYBOX=$(which busybox)
14 14
 }
15 15
 
16 16
 set -e
17
-ROOTFS=/tmp/rootfs-busybox-$$-$RANDOM
17
+ROOTFS=${TMPDIR:-/var/tmp}/rootfs-busybox-$$-$RANDOM
18 18
 mkdir $ROOTFS
19 19
 cd $ROOTFS
20 20
 
... ...
@@ -14,9 +14,9 @@ die () {
14 14
 
15 15
 ISO=${1}
16 16
 
17
-ROOTFS=$(mktemp -d /tmp/rootfs-crux-XXXXXXXXXX)
18
-CRUX=$(mktemp -d /tmp/crux-XXXXXXXXXX)
19
-TMP=$(mktemp -d /tmp/XXXXXXXXXX)
17
+ROOTFS=$(mktemp -d ${TMPDIR:-/var/tmp}/rootfs-crux-XXXXXXXXXX)
18
+CRUX=$(mktemp -d ${TMPDIR:-/var/tmp}/crux-XXXXXXXXXX)
19
+TMP=$(mktemp -d ${TMPDIR:-/var/tmp}/XXXXXXXXXX)
20 20
 
21 21
 VERSION=$(basename --suffix=.iso $ISO | sed 's/[^0-9.]*\([0-9.]*\).*/\1/')
22 22
 
... ...
@@ -118,7 +118,7 @@ fi
118 118
 # will be filled in later, if [ -z "$skipDetection" ]
119 119
 lsbDist=''
120 120
 
121
-target="/tmp/docker-rootfs-debootstrap-$suite-$$-$RANDOM"
121
+target="${TMPDIR:-/var/tmp}/docker-rootfs-debootstrap-$suite-$$-$RANDOM"
122 122
 
123 123
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
124 124
 returnTo="$(pwd -P)"
... ...
@@ -39,7 +39,7 @@ if [ ! "$repo" ] || [ ! "$distro" ]; then
39 39
 	exit 1
40 40
 fi
41 41
 
42
-target="/tmp/docker-rootfs-rinse-$distro-$$-$RANDOM"
42
+target="${TMPDIR:-/var/tmp}/docker-rootfs-rinse-$distro-$$-$RANDOM"
43 43
 
44 44
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
45 45
 returnTo="$(pwd -P)"
... ...
@@ -15,7 +15,7 @@ SOCAT=$(which socat)
15 15
 
16 16
 shopt -s extglob
17 17
 set -ex
18
-ROOTFS=`mktemp -d /tmp/rootfs-busybox.XXXXXXXXXX`
18
+ROOTFS=`mktemp -d ${TMPDIR:-/var/tmp}/rootfs-busybox.XXXXXXXXXX`
19 19
 trap "rm -rf $ROOTFS" INT QUIT TERM
20 20
 cd $ROOTFS
21 21
 
... ...
@@ -50,7 +50,7 @@ fi
50 50
 
51 51
 delDir=
52 52
 if [ -z "$dir" ]; then
53
-	dir="$(mktemp -d ${TMPDIR:-/tmp}/docker-mkimage.XXXXXXXXXX)"
53
+	dir="$(mktemp -d ${TMPDIR:-/var/tmp}/docker-mkimage.XXXXXXXXXX)"
54 54
 	delDir=1
55 55
 fi
56 56