4363: Merge branch 'master' into 4363-less-filename-munging

[arvados.git] / docker / arvdock

diff --git a/docker/arvdock b/docker/arvdock
index 27b7085ef164499730fa3050e83f6b016076e23f..31e405bb410213dc798ccbeb9d85b916177369b6 100755 (executable)
--- a/docker/arvdock
+++ b/docker/arvdock
@@ -318,16 +318,18 @@ function do_start {
 
     if [[ $start_api != false ]]
     then
-        if [ -d $HOME/.config/arvados ] || mkdir -p $HOME/.config/arvados
+        if [[ -f "api/generated/superuser_token" ]]
         then
+          if [ -d $HOME/.config/arvados ] || mkdir -p $HOME/.config/arvados
+          then
             cat >$HOME/.config/arvados/settings.conf <<EOF
 ARVADOS_API_HOST=$(ip_address "api_server")
 ARVADOS_API_HOST_INSECURE=yes
 ARVADOS_API_TOKEN=$(cat api/generated/superuser_token)
 EOF
+          fi
         fi
     fi
-
 }
 
 function do_stop {