projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3605: Automatically reload the dashboard using ajax.
[arvados.git]
/
docker
/
arvdock
diff --git
a/docker/arvdock
b/docker/arvdock
index 0122fc3552e7c81d5a94be0b035c46f669abe533..e36e5cfd597cb06c7f0a89646eb6838177a0655a 100755
(executable)
--- a/
docker/arvdock
+++ b/
docker/arvdock
@@
-83,11
+83,11
@@
function start_container {
#echo " $DOCKER run --dns=127.0.0.1 $args $image"
echo " $DOCKER run $args $image"
container=`$DOCKER run $args $image`
#echo " $DOCKER run --dns=127.0.0.1 $args $image"
echo " $DOCKER run $args $image"
container=`$DOCKER run $args $image`
- if [
[ "$?" != "0" ]
]; then
+ if [
"$?" != "0" -o "$container" = ""
]; then
echo "Unable to start container"
exit 1
fi
echo "Unable to start container"
exit 1
fi
- if [
[ "$name" == "compute" || "$ENABLE_SSH" != "false" ]
];
+ if [
"$name" == "compute" -o "$ENABLE_SSH" != "false"
];
then
ip=$(ip_address $container )
echo
then
ip=$(ip_address $container )
echo
@@
-95,6
+95,8
@@
function start_container {
echo
echo " ssh root@$ip"
echo
echo
echo " ssh root@$ip"
echo
+ else
+ echo "Started container: $container"
fi
if [[ "$name" == "doc_server" ]]; then
fi
if [[ "$name" == "doc_server" ]]; then