[ARVADOS] updated: dee0d839af1a7cd1eca4b31f7f2371ff3b0803ed

[git at public.curoverse.com]

Summary of changes:
 docker/mkimage-debootstrap.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

       via  dee0d839af1a7cd1eca4b31f7f2371ff3b0803ed (commit)
      from  4f77c7788c6fc3a6cc9cd90ff231d837fdec7cc4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit dee0d839af1a7cd1eca4b31f7f2371ff3b0803ed
Author: Ward Vandewege <ward at curoverse.com>
Date:   Thu Jul 9 22:20:44 2015 -0400

    Make sure that mkimage-debootstrap.sh does not try to do an interactive
    docker run when there's no tty.
    
    refs #6528

diff --git a/docker/mkimage-debootstrap.sh b/docker/mkimage-debootstrap.sh
index 319104a..0e99ec6 100755
--- a/docker/mkimage-debootstrap.sh
+++ b/docker/mkimage-debootstrap.sh
@@ -201,7 +201,8 @@ else
 	sudo tar --numeric-owner -c . | $docker import - $repo:$suite
 	
 	# test the image
-	$docker run -i -t $repo:$suite echo success
+	[[ "$(/usr/bin/tty || true)" != "not a tty" ]] && RUN_OPTS="-i -t"
+	$docker run $RUN_OPS $repo:$suite echo success
 	
 	if [ -z "$skipDetection" ]; then
 		case "$lsbDist" in

-----------------------------------------------------------------------


hooks/post-receive
--