Merge branch 'master' into 5417-not-start-pipeline-with-unreadable-inputs

[arvados.git] / docker / mkimage-debootstrap.sh

diff --git a/docker/mkimage-debootstrap.sh b/docker/mkimage-debootstrap.sh
index 1eefac9479e67eb196b9794b2b024769391d9284..319104ac003a742d74d70c8198c69d97f25d074b 100755 (executable)
--- a/docker/mkimage-debootstrap.sh
+++ b/docker/mkimage-debootstrap.sh
@@ -86,10 +86,12 @@ if [ ! "$repo" ] || [ ! "$suite" ]; then
 fi
 
 # some rudimentary detection for whether we need to "sudo" our docker calls
+set +e
 docker=`which docker.io`
 if [[ "$docker" == "" ]]; then
        docker=`which docker`
 fi
+set -e
 
 if $docker version > /dev/null 2>&1; then
        docker="$docker"
@@ -116,7 +118,7 @@ fi
 # will be filled in later, if [ -z "$skipDetection" ]
 lsbDist=''
 
-target="/tmp/docker-rootfs-debootstrap-$suite-$$-$RANDOM"
+target="${TMPDIR:-/tmp}/docker-rootfs-debootstrap-$suite-$$-$RANDOM"
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
 returnTo="$(pwd -P)"