docker: usability improvements for arvdock.

[arvados.git] / docker / arvdock

diff --git a/docker/arvdock b/docker/arvdock
index ed8da8bead4cc6a8f439545e86886d1f70137986..30daabce62cdee65531affa4735cf22f2988c440 100755 (executable)
--- a/docker/arvdock
+++ b/docker/arvdock
@@ -1,6 +1,11 @@
 #!/bin/bash
 
 ENABLE_SSH=false
+DOCKER=`which docker.io`
+
+if [[ "$DOCKER" == "" ]]; then
+    DOCKER=`which docker`
+fi
 
 function usage {
     echo >&2
@@ -23,7 +28,7 @@ function usage {
 
 function ip_address {
     local container=$1
-    echo `docker inspect $container  |grep IPAddress |cut -f4 -d\"`
+    echo `$DOCKER inspect $container  |grep IPAddress |cut -f4 -d\"`
 }
 
 function start_container {
@@ -34,7 +39,7 @@ function start_container {
     fi
     if [[ "$2" != '' ]]; then
       local name="$2"
-      args="$args -name $name"
+      args="$args --name $name"
     fi
     if [[ "$3" != '' ]]; then
       local volume="$3"
@@ -42,7 +47,7 @@ function start_container {
     fi
     if [[ "$4" != '' ]]; then
       local link="$4"
-      args="$args -link $link"
+      args="$args --link $link"
     fi
     local image=$5
 
@@ -51,18 +56,18 @@ function start_container {
       args="$args -e ENABLE_SSH=$ENABLE_SSH"
     fi
 
-    `docker ps |grep -P "$name[^/]" -q`
+    `$DOCKER ps |grep -P "$name[^/]" -q`
     if [[ "$?" == "0" ]]; then
       echo "You have a running container with name $name -- skipping."
       return
     fi
 
     # Remove any existing container by this name.
-    docker rm "$name" 2>/dev/null
+    $DOCKER rm "$name" 2>/dev/null
 
     echo "Starting container:"
-    echo "  docker run $args $image"
-    container=`docker run $args $image`
+    echo "  $DOCKER run $args $image"
+    container=`$DOCKER run $args $image`
     if [[ "$?" != "0" ]]; then
       echo "Unable to start container"
       exit 1
@@ -76,6 +81,24 @@ function start_container {
       echo "    ssh root@$ip"
       echo
     fi
+
+    if [[ "$name" == "doc_server" ]]; then
+      echo
+      echo "*****************************************************************"
+      echo "You can access the Arvados documentation at http://localhost:${port%:*}"
+      echo "*****************************************************************"
+      echo
+    fi
+
+    if [[ "$name" == "workbench_server" ]]; then
+      echo
+      echo "*****************************************************************"
+      echo "You can access the Arvados workbench at http://localhost:${port%:*}"
+      echo "*****************************************************************"
+      echo
+   fi
+
+
 }
 
 declare -a keep_volumes
@@ -183,22 +206,22 @@ function do_start {
 
     if [[ $start_doc != false ]]
     then
-       start_container "9898:80" "doc_server" '' '' "arvados/doc"
+       start_container "$start_doc:80" "doc_server" '' '' "arvados/doc"
     fi
 
     if [[ $start_sso != false ]]
     then
-       start_container "9901:443" "sso_server" '' '' "arvados/sso"
+       start_container "$start_sso:443" "sso_server" '' '' "arvados/sso"
     fi
 
     if [[ $start_api != false ]]
     then
-       start_container "9900:443" "api_server" '' "sso_server:sso" "arvados/api"
+       start_container "$start_api:443" "api_server" '' "sso_server:sso" "arvados/api"
     fi
 
     if [[ $start_workbench != false ]]
     then
-       start_container "9899:80" "workbench_server" '' "api_server:api" "arvados/workbench"
+       start_container "$start_workbench:80" "workbench_server" '' "api_server:api" "arvados/workbench"
     fi
 
     if [[ $start_keep != false ]]
@@ -213,11 +236,11 @@ function do_start {
        start_container "25107:25107" "keep_server_0" \
            "${keep_volumes[0]}:/dev/keep-0" \
            "api_server:api" \
-           "arvados/warehouse"
+           "arvados/keep"
        start_container "25108:25107" "keep_server_1" \
            "${keep_volumes[1]}:/dev/keep-0" \
            "api_server:api" \
-           "arvados/warehouse"
+           "arvados/keep"
     fi
 
     if [ -d $HOME/.config/arvados ] || mkdir -p $HOME/.config/arvados
@@ -228,6 +251,7 @@ ARVADOS_API_HOST_INSECURE=yes
 ARVADOS_API_TOKEN=$(cat api/generated/superuser_token)
 EOF
     fi
+
 }
 
 function do_stop {
@@ -274,7 +298,7 @@ function do_stop {
        esac
     done
 
-    # If no options were selected, then start all servers.
+    # If no options were selected, then stop all servers.
     if [[ $stop_doc == "" &&
          $stop_sso == "" &&
          $stop_api == "" &&
@@ -288,7 +312,7 @@ function do_stop {
        stop_keep="keep_server_0 keep_server_1"
     fi
 
-    docker stop $stop_doc $stop_sso $stop_api $stop_workbench $stop_keep \
+    $DOCKER stop $stop_doc $stop_sso $stop_api $stop_workbench $stop_keep \
        2>/dev/null
 }
 
@@ -313,7 +337,7 @@ function do_test {
                python -m unittest discover ../sdk/python
                ;;
            api)
-               docker run -t -i arvados/api \
+               $DOCKER run -t -i arvados/api \
                    /usr/src/arvados/services/api/script/rake_test.sh
                ;;
            *)