X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ced5e21f292fd8afa2cf2dc3345eb8a1c714d9cf..659ce826d7e04bab793a4a3ab67dcd38cf98326d:/docker/arvdock diff --git a/docker/arvdock b/docker/arvdock index b2fa4b2cf5..e4a0ca5f63 100755 --- 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 { @@ -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 @@ -88,18 +111,18 @@ 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) + 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) + 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 } @@ -123,111 +146,112 @@ function do_start { while [ $# -ge 1 ] do case $1 in - -d | --doc) - case "$2" in - "") start_doc=9898; shift 2 ;; - *) start_doc=$2; shift 2 ;; - esac - ;; - -s | --sso) - case "$2" in - "") start_sso=9901; shift 2 ;; - *) start_sso=$2; shift 2 ;; - esac - ;; - -a | --api) - case "$2" in - "") start_api=9900; shift 2 ;; - *) start_api=$2; shift 2 ;; - esac - ;; - -w | --workbench) - case "$2" in - "") start_workbench=9899; shift 2 ;; - *) start_workbench=$2; shift 2 ;; - esac - ;; - -k | --keep ) - start_keep=true - shift - ;; - --ssh) - # ENABLE_SSH is a global variable - ENABLE_SSH=true - shift - ;; - --) - shift - break - ;; - *) - usage - exit 1 - ;; - esac + -d | --doc) + case "$2" in + "") start_doc=9898; shift 2 ;; + *) start_doc=$2; shift 2 ;; + esac + ;; + -s | --sso) + case "$2" in + "") start_sso=9901; shift 2 ;; + *) start_sso=$2; shift 2 ;; + esac + ;; + -a | --api) + case "$2" in + "") start_api=9900; shift 2 ;; + *) start_api=$2; shift 2 ;; + esac + ;; + -w | --workbench) + case "$2" in + "") start_workbench=9899; shift 2 ;; + *) start_workbench=$2; shift 2 ;; + esac + ;; + -k | --keep ) + start_keep=true + shift + ;; + --ssh) + # ENABLE_SSH is a global variable + ENABLE_SSH=true + shift + ;; + --) + shift + break + ;; + *) + usage + exit 1 + ;; + esac done # If no options were selected, then start all servers. if [[ $start_doc == false && - $start_sso == false && - $start_api == false && - $start_workbench == false && - $start_keep == false ]] + $start_sso == false && + $start_api == false && + $start_workbench == false && + $start_keep == false ]] then - start_doc=9898 - start_sso=9901 - start_api=9900 - start_workbench=9899 - start_keep=true + start_doc=9898 + start_sso=9901 + start_api=9900 + start_workbench=9899 + start_keep=true fi 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 ]] then - # create `keep_volumes' array with a list of keep mount points - # remove any stale metadata from those volumes before starting them - make_keep_volumes - for v in ${keep_volumes[*]} - do - [ -f $v/keep/.metadata.yml ] && sudo rm $v/keep/.metadata.yml - done - start_container "25107:25107" "keep_server_0" \ - "${keep_volumes[0]}:/dev/keep-0" \ - "api_server:api" \ - "arvados/warehouse" - start_container "25108:25107" "keep_server_1" \ - "${keep_volumes[1]}:/dev/keep-0" \ - "api_server:api" \ - "arvados/warehouse" + # create `keep_volumes' array with a list of keep mount points + # remove any stale metadata from those volumes before starting them + make_keep_volumes + for v in ${keep_volumes[*]} + do + [ -f $v/keep/.metadata.yml ] && sudo rm $v/keep/.metadata.yml + done + start_container "25107:25107" "keep_server_0" \ + "${keep_volumes[0]}:/dev/keep-0" \ + "api_server:api" \ + "arvados/keep" + start_container "25108:25107" "keep_server_1" \ + "${keep_volumes[1]}:/dev/keep-0" \ + "api_server:api" \ + "arvados/keep" fi if [ -d $HOME/.config/arvados ] || mkdir -p $HOME/.config/arvados then - cat >$HOME/.config/arvados/settings.conf <$HOME/.config/arvados/settings.conf </dev/null + $DOCKER stop $stop_doc $stop_sso $stop_api $stop_workbench $stop_keep \ + 2>/dev/null } function do_test { local alltests if [ $# -lt 1 ] then - alltests="python-sdk api" + alltests="python-sdk api" else - alltests="$@" + alltests="$@" fi for testname in $alltests do - echo "testing $testname..." - case $testname in - python-sdk) - do_start --api --keep --sso - export ARVADOS_API_HOST=$(ip_address "api_server") - export ARVADOS_API_HOST_INSECURE=yes - export ARVADOS_API_TOKEN=$(cat api/generated/superuser_token) - python -m unittest discover ../sdk/python - ;; - api) - docker run -t -i arvados/api \ - /usr/src/arvados/services/api/script/rake_test.sh - ;; - *) - echo >&2 "unknown test $testname" - ;; - esac + echo "testing $testname..." + case $testname in + python-sdk) + do_start --api --keep --sso + export ARVADOS_API_HOST=$(ip_address "api_server") + export ARVADOS_API_HOST_INSECURE=yes + export ARVADOS_API_TOKEN=$(cat api/generated/superuser_token) + python -m unittest discover ../sdk/python + ;; + api) + $DOCKER run -t -i arvados/api \ + /usr/src/arvados/services/api/script/rake_test.sh + ;; + *) + echo >&2 "unknown test $testname" + ;; + esac done } @@ -331,24 +355,24 @@ fi case $1 in start) - shift - do_start $@ - ;; + shift + do_start $@ + ;; stop) - shift - do_stop $@ - ;; + shift + do_stop $@ + ;; restart) - shift - do_stop $@ - do_start $@ - ;; + shift + do_stop $@ + do_start $@ + ;; test) - shift - do_test $@ - ;; + shift + do_test $@ + ;; *) - usage - exit 1 - ;; + usage + exit 1 + ;; esac