From 0b3ae1c64548f41c3930ac76d90466c2ce6cc639 Mon Sep 17 00:00:00 2001
From: Tim Pierce <twp@unchi.org>
Date: Thu, 5 Dec 2013 14:26:39 -0500
Subject: [PATCH] Reorganized code to support 'start' command.

---
 docker/run.sh | 270 ++++++++++++++++++++++++++++----------------------
 1 file changed, 151 insertions(+), 119 deletions(-)

diff --git a/docker/run.sh b/docker/run.sh
index 418771553a..cea9c0322e 100755
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -1,99 +1,67 @@
 #!/bin/bash
 
+ENABLE_SSH=false
+DOCKER_ARGS="-d -i -t"
+
 function usage {
-  echo >&2 "usage: $0 [--doc] [--sso] [--api] [--workbench] [--keep]"
-  echo >&2 "If no switches are given, the default is to start all servers."
+    echo >&2 "usage:"
+    echo >&2 "$0 start [--ssh] [--doc] [--sso] [--api] [--workbench] [--keep]"
+    echo >&2 "$0 stop"
+    echo >&2 "$0 test"
+    echo >&2 "If no switches are given, the default is to start all servers."
 }
 
-if [[ "$ENABLE_SSH" != "" ]]; then
-  EXTRA=" -e ENABLE_SSH=$ENABLE_SSH"
-else
-  EXTRA=''
-fi
-
-start_doc=false
-start_sso=false
-start_api=false
-start_workbench=false
-start_keep=false
-
-while [ $# -ge 1 ]
-do
-    case $1 in
-	--doc)
-	    start_doc=true
-	    ;;
-	--sso)
-	    start_sso=true
-	    ;;
-	--api)
-	    start_api=true
-	    ;;
-	--workbench)
-	    start_workbench=true
-	    ;;
-	--keep)
-	    start_keep=true
-	    ;;
-	*)
-	    usage
-	    exit 1
-	    ;;
-    esac
-    shift
-done
-
-# If no options were selected, then start all servers.
-if $start_doc || $start_sso || $start_api || $start_workbench || $start_keep
-then
-    :
-else
-    start_doc=true
-    start_sso=true
-    start_api=true
-    start_workbench=true
-    start_keep=true
-fi
-
 function ip_address {
-  local container=$1
-  echo `docker inspect $container  |grep IPAddress |cut -f4 -d\"`
+    local container=$1
+    echo `docker inspect $container  |grep IPAddress |cut -f4 -d\"`
 }
 
 function start_container {
-  local port="-p $1"
-  if [[ "$2" != '' ]]; then
-    local name="-name $2"
-  fi
-  if [[ "$3" != '' ]]; then
-    local volume="-v $3"
-  fi
-  if [[ "$4" != '' ]]; then
-    local link="-link $4"
-  fi
-  local image=$5
-
-  `docker ps |grep -P "$2[^/]" -q`
-  if [[ "$?" == "0" ]]; then
-    echo "You have a running container with name $2 -- skipping."
-    return
-  fi
-
-  echo "Starting container:"
-  echo "  docker run -d -i -t$EXTRA $port $name $volume $link $image"
-  container=`docker run -d -i -t$EXTRA $port $name $volume $link $image`
-  if [[ "$?" != "0" ]]; then
-    echo "Unable to start container"
-    exit 1
-  fi
-  if [[ $EXTRA ]]; then
-    ip=$(ip_address $container )
-    echo
-    echo "You can ssh into the container with:"
-    echo
-    echo "    ssh root@$ip"
-    echo
-  fi
+    local port="-p $1"
+    if [[ "$2" != '' ]]; then
+      local name="$2"
+      DOCKER_ARGS="$DOCKER_ARGS -name $name"
+    fi
+    if [[ "$3" != '' ]]; then
+      local volume="$3"
+      DOCKER_ARGS="$DOCKER_ARGS -v $volume"
+    fi
+    if [[ "$4" != '' ]]; then
+      local link="$4"
+      DOCKER_ARGS="$DOCKER_ARGS -link $link"
+    fi
+    local image=$5
+
+    if $ENABLE_SSH
+    then
+      DOCKER_ARGS="$DOCKER_ARGS -e ENABLE_SSH=$ENABLE_SSH"
+    fi
+
+    `docker ps |grep -P "$name[^/]" -q`
+    if [[ "$?" == "0" ]]; then
+      echo "You have a running container with name $name -- skipping."
+      return
+    fi
+
+    # If a container by this name already exists, remove it before
+    # starting a new one.
+    
+    echo "Starting container:"
+    echo "  docker run $DOCKER_ARGS $image"
+    container=`docker run $DOCKER_ARGS $image`
+    if [[ "$?" != "0" ]]; then
+      echo "Unable to start container"
+      exit 1
+    fi
+    if $ENABLE_SSH
+    then
+      ip=$(ip_address $container )
+      echo
+      echo "You can ssh into the container with:"
+      echo
+      echo "    ssh root@$ip"
+      echo
+    fi
 }
 
 declare -a keep_volumes
@@ -103,41 +71,105 @@ declare -a keep_volumes
 # directory), use them; create temporary volumes if necessary.
 #
 function make_keep_volumes () {
-  # Mount a keep volume if we don't already have one
-  for mountpoint in $(cut -d ' ' -f 2 /proc/mounts); do
-    if [[ -d "$mountpoint/keep" && "$mountpoint" != "/" ]]; then
-      keep_volumes+=($mountpoint)
-    fi
-  done
-
-  # Create any keep volumes that do not yet exist.
-  while [ ${#keep_volumes[*]} -lt 2 ]
-  do
-    new_keep=$(mktemp -d)
-    echo >&2 "mounting 512M tmpfs keep volume in $new_keep"
-    sudo mount -t tmpfs -o size=512M tmpfs $new_keep
-    mkdir $new_keep/keep
-    keep_volumes+=($new_keep)
-  done
+    # Mount a keep volume if we don't already have one
+    for mountpoint in $(cut -d ' ' -f 2 /proc/mounts); do
+      if [[ -d "$mountpoint/keep" && "$mountpoint" != "/" ]]; then
+	keep_volumes+=($mountpoint)
+      fi
+    done
+
+    # Create any keep volumes that do not yet exist.
+    while [ ${#keep_volumes[*]} -lt 2 ]
+    do
+	new_keep=$(mktemp -d)
+	echo >&2 "mounting 512M tmpfs keep volume in $new_keep"
+	sudo mount -t tmpfs -o size=512M tmpfs $new_keep
+	mkdir $new_keep/keep
+	keep_volumes+=($new_keep)
+    done
 }
 
-$start_doc && start_container "9898:80" "doc_server" '' '' "arvados/doc"
-$start_sso && start_container "9901:443" "sso_server" '' '' "arvados/sso"
-$start_api && start_container "9900:443" "api_server" '' "sso_server:sso" "arvados/api"
-$start_workbench && start_container "9899:80" "workbench_server" '' "api_server:api" "arvados/workbench"
+function do_start {
+    local start_doc=false
+    local start_sso=false
+    local start_api=false
+    local start_workbench=false
+    local start_keep=false
+
+    while [ $# -ge 1 ]
+    do
+        case $1 in
+	    --doc)
+		start_doc=true
+		;;
+	    --sso)
+		start_sso=true
+		;;
+	    --api)
+		start_api=true
+		;;
+	    --workbench)
+		start_workbench=true
+		;;
+	    --keep)
+		start_keep=true
+		;;
+	    --ssh)
+		ENABLE_SSH=true
+		;;
+	    *)
+		usage
+		exit 1
+		;;
+	esac
+	shift
+    done
+
+    # If no options were selected, then start all servers.
+    if $start_doc || $start_sso || $start_api || $start_workbench || $start_keep
+    then
+      :
+    else
+      start_doc=true
+      start_sso=true
+      start_api=true
+      start_workbench=true
+      start_keep=true
+    fi
+
+    $start_doc && start_container "9898:80" "doc_server" '' '' "arvados/doc"
+    $start_sso && start_container "9901:443" "sso_server" '' '' "arvados/sso"
+    $start_api && start_container "9900:443" "api_server" '' "sso_server:sso" "arvados/api"
+    $start_workbench && start_container "9899:80" "workbench_server" '' "api_server:api" "arvados/workbench"
 
-declare -a keep_volumes
-make_keep_volumes
-$start_keep && start_container "25107:25107" "keep_server_0" "${keep_volumes[0]}:/dev/keep-0" "api_server:api" "arvados/warehouse"
-$start_keep && start_container "25108:25107" "keep_server_1" "${keep_volumes[1]}:/dev/keep-0" "api_server:api" "arvados/warehouse"
+    make_keep_volumes
+    $start_keep && start_container "25107:25107" "keep_server_0" "${keep_volumes[0]}:/dev/keep-0" "api_server:api" "arvados/warehouse"
+    $start_keep && start_container "25108:25107" "keep_server_1" "${keep_volumes[1]}:/dev/keep-0" "api_server:api" "arvados/warehouse"
+
+    ARVADOS_API_HOST=$(ip_address "api_server")
+    ARVADOS_API_HOST_INSECURE=yes
+    ARVADOS_API_TOKEN=$(grep '^\w' api/generated/secret_token.rb | cut -d "'" -f 2)
 
-ARVADOS_API_HOST=$(ip_address "api_server")
-ARVADOS_API_HOST_INSECURE=yes
-ARVADOS_API_TOKEN=$(grep '^\w' api/generated/secret_token.rb | cut -d "'" -f 2)
+    echo "To run a test suite:"
+    echo "export ARVADOS_API_HOST=$ARVADOS_API_HOST"
+    echo "export ARVADOS_API_HOST_INSECURE=$ARVADOS_API_HOST_INSECURE"
+    echo "export ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN"
+    echo "python -m unittest discover ../sdk/python"
+}
 
-echo "To run a test suite:"
+if [ $# -lt 1 ]
+then
+  usage
+  exit 1
+fi
 
-echo "export ARVADOS_API_HOST=$ARVADOS_API_HOST"
-echo "export ARVADOS_API_HOST_INSECURE=$ARVADOS_API_HOST_INSECURE"
-echo "export ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN"
-echo "python -m unittest discover ../sdk/python"
+case $1 in
+    start)
+	shift
+	do_start $@
+	;;
+    *)
+	usage
+	exit 1
+	;;
+esac
-- 
2.30.2