3235: Remove errant action exemption.

[arvados.git] / docker / arvdock

diff --git a/docker/arvdock b/docker/arvdock
index e4a0ca5f63b0ad9639119b1e13b4b71e6afcd076..f2edc19c737107857e6216b41de52f2e04308d09 100755 (executable)
--- a/docker/arvdock
+++ b/docker/arvdock
@@ -170,7 +170,7 @@ function do_start {
                     *)  start_workbench=$2; shift 2 ;;
                 esac
                 ;;
-            -k | --keep )
+            -k | --keep)
                 start_keep=true
                 shift
                 ;;
@@ -204,11 +204,6 @@ function do_start {
         start_keep=true
     fi
 
-    if [[ $start_doc != false ]]
-    then
-        start_container "$start_doc:80" "doc_server" '' '' "arvados/doc"
-    fi
-
     if [[ $start_sso != false ]]
     then
         start_container "$start_sso:443" "sso_server" '' '' "arvados/sso"
@@ -219,11 +214,6 @@ function do_start {
         start_container "$start_api:443" "api_server" '' "sso_server:sso" "arvados/api"
     fi
 
-    if [[ $start_workbench != false ]]
-    then
-        start_container "$start_workbench:80" "workbench_server" '' "api_server:api" "arvados/workbench"
-    fi
-
     if [[ $start_keep != false ]]
     then
         # create `keep_volumes' array with a list of keep mount points
@@ -243,6 +233,16 @@ function do_start {
             "arvados/keep"
     fi
 
+    if [[ $start_doc != false ]]
+    then
+        start_container "$start_doc:80" "doc_server" '' '' "arvados/doc"
+    fi
+
+    if [[ $start_workbench != false ]]
+    then
+        start_container "$start_workbench:80" "workbench_server" '' "api_server:api" "arvados/workbench"
+    fi
+
     if [ -d $HOME/.config/arvados ] || mkdir -p $HOME/.config/arvados
     then
         cat >$HOME/.config/arvados/settings.conf <<EOF