X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/36ca0d3ede8554a229d6872b151b7e79ce959ba9..8a42d33f69d5e0889d9f390acb4947c20edff33e:/docker/mkimage-debootstrap.sh

diff --git a/docker/mkimage-debootstrap.sh b/docker/mkimage-debootstrap.sh
index a078801b90..319104ac00 100755
--- a/docker/mkimage-debootstrap.sh
+++ b/docker/mkimage-debootstrap.sh
@@ -86,13 +86,19 @@ if [ ! "$repo" ] || [ ! "$suite" ]; then
 fi
 
 # some rudimentary detection for whether we need to "sudo" our docker calls
-docker=''
-if docker version > /dev/null 2>&1; then
-	docker='docker'
-elif sudo docker version > /dev/null 2>&1; then
-	docker='sudo docker'
-elif command -v docker > /dev/null 2>&1; then
-	docker='docker'
+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"
+elif sudo $docker version > /dev/null 2>&1; then
+	docker="sudo $docker"
+elif command -v $docker > /dev/null 2>&1; then
+	docker="$docker"
 else
 	echo >&2 "warning: either docker isn't installed, or your current user cannot run it;"
 	echo >&2 "         this script is not likely to work as expected"
@@ -112,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)"