From c663e037c8ad2c8dab1f4867a51e3d045357c9f6 Mon Sep 17 00:00:00 2001
From: Peter Amstutz <pamstutz@veritasgenetics.com>
Date: Thu, 8 Nov 2018 11:16:53 -0500
Subject: [PATCH] "arvbox status" includes cluster id refs #14198

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>
---
 tools/arvbox/bin/arvbox | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index a26c396e2e..69fc2cedee 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -75,6 +75,10 @@ gethost() {
     fi
 }
 
+getclusterid() {
+    docker exec $ARVBOX_CONTAINER cat /var/lib/arvados/api_uuid_prefix
+}
+
 updateconf() {
     if test -f ~/.config/arvados/$ARVBOX_CONTAINER.conf ; then
         sed "s/ARVADOS_API_HOST=.*/ARVADOS_API_HOST=$(gethost):8000/" <$HOME/.config/arvados/$ARVBOX_CONTAINER.conf >$HOME/.config/arvados/$ARVBOX_CONTAINER.conf.tmp
@@ -382,8 +386,9 @@ case "$subcmd" in
         ;;
 
     status)
-        echo "Selected: $ARVBOX_CONTAINER"
+        echo "Container: $ARVBOX_CONTAINER"
         if docker ps -a --filter "status=running" | grep -E "$ARVBOX_CONTAINER$" -q ; then
+	    echo "Cluster id: $(getclusterid)"
             echo "Status: running"
             echo "Container IP: $(getip)"
             echo "Published host: $(gethost)"
@@ -453,11 +458,11 @@ case "$subcmd" in
 
     sv)
         if test -n "$1" -a -n "$2" ; then
-            exec docker exec -ti $ARVBOX_CONTAINER sv "$@"
+            exec docker exec $ARVBOX_CONTAINER sv "$@"
         else
             echo "Usage: $0 $subcmd <start|stop|restart> <service>"
             echo "Available services:"
-            exec docker exec -ti $ARVBOX_CONTAINER ls /etc/service
+            exec docker execa $ARVBOX_CONTAINER ls /etc/service
         fi
         ;;
 
-- 
2.30.2