X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/30e420e6cc547a12f2a775188f0429b3607da6c3..5c8437e59cbfd13b99d402b42b6bdfc18aa82bf8:/docker/mkimage-debootstrap.sh diff --git a/docker/mkimage-debootstrap.sh b/docker/mkimage-debootstrap.sh index 1eefac9479..b4010ef4d6 100755 --- 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"