projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Avoid optional disk cache usage if it is owned by a different user. refs #2659.
[arvados.git]
/
docker
/
mkimage-debootstrap.sh
diff --git
a/docker/mkimage-debootstrap.sh
b/docker/mkimage-debootstrap.sh
index 1eefac9479e67eb196b9794b2b024769391d9284..b4010ef4d69e5603d417763bed611fae1f0b4832 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"