X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5126d94fd644a657243e5ec80d5ef1fc250f8b76..78691191dfa23c930a00c6d5cb6dcd4ce30b1a5e:/docker/arvdock?ds=sidebyside diff --git a/docker/arvdock b/docker/arvdock index 372f32292a..2107ff3417 100755 --- a/docker/arvdock +++ b/docker/arvdock @@ -1,24 +1,28 @@ #!/bin/bash -ENABLE_SSH=false DOCKER=`which docker.io` if [[ "$DOCKER" == "" ]]; then DOCKER=`which docker` fi +COMPUTE_COUNTER=0 + function usage { echo >&2 - echo >&2 "usage: $0 (start|stop|restart|test) [options]" + echo >&2 "usage: $0 (start|stop|restart|test|reset) [options]" echo >&2 echo >&2 "$0 start/stop/restart options:" - echo >&2 " -d [port], --doc[=port] Documentation server (default port 9898)" - echo >&2 " -w [port], --workbench[=port] Workbench server (default port 9899)" - echo >&2 " -s [port], --sso[=port] SSO server (default port 9901)" - echo >&2 " -a [port], --api[=port] API server (default port 9900)" - echo >&2 " -k, --keep Keep servers" - echo >&2 " --ssh Enable SSH access to server containers" - echo >&2 " -h, --help Display this help and exit" + echo >&2 " -d[port], --doc[=port] Documentation server (default port 9898)" + echo >&2 " -w[port], --workbench[=port] Workbench server (default port 9899)" + echo >&2 " -s[port], --sso[=port] SSO server (default port 9901)" + echo >&2 " -a[port], --api[=port] API server (default port 9900)" + echo >&2 " -c, --compute Compute nodes (starts 2)" + echo >&2 " -v, --vm Shell server" + echo >&2 " -n, --nameserver Nameserver" + echo >&2 " -k, --keep Keep servers" + echo >&2 " -p, --keepproxy Keepproxy server" + echo >&2 " -h, --help Display this help and exit" echo >&2 echo >&2 " If no options are given, the action is applied to all servers." echo >&2 @@ -39,11 +43,20 @@ function start_container { fi if [[ "$2" != '' ]]; then local name="$2" - args="$args --name $name" + if [[ "$name" == "api_server" ]]; then + args="$args --dns=172.17.42.1 --dns-search=compute.dev.arvados --hostname api -P --name $name" + elif [[ "$name" == "compute" ]]; then + name=$name$COMPUTE_COUNTER + # We need --privileged because we run docker-inside-docker on the compute nodes + args="$args --dns=172.17.42.1 --dns-search=compute.dev.arvados --hostname compute$COMPUTE_COUNTER -P --privileged --name $name" + let COMPUTE_COUNTER=$(($COMPUTE_COUNTER + 1)) + else + args="$args --dns=172.17.42.1 --dns-search=dev.arvados --hostname ${name#_server} --name $name" + fi fi if [[ "$3" != '' ]]; then local volume="$3" - args="$args -v $volume" + args="$args --volumes-from $volume" fi if [[ "$4" != '' ]]; then local link="$4" @@ -51,35 +64,27 @@ function start_container { fi local image=$5 - if $ENABLE_SSH - then - args="$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 - # Remove any existing container by this name. - $DOCKER rm "$name" 2>/dev/null + echo "Starting container: $name" + `$DOCKER ps --all |grep -P "$name[^/]" -q` + if [[ "$?" == "0" ]]; then + echo " $DOCKER start $name" + container=`$DOCKER start $name` + else + echo " $DOCKER run $args $image" + container=`$DOCKER run $args $image` + fi - echo "Starting container:" - echo " $DOCKER run $args $image" - container=`$DOCKER run $args $image` - if [[ "$?" != "0" ]]; then + if [ "$?" != "0" -o "$container" = "" ]; 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 + else + echo "Started container: $container" fi if [[ "$name" == "doc_server" ]]; then @@ -101,41 +106,30 @@ function start_container { } -declare -a keep_volumes - -# Initialize the global `keep_volumes' array. If any keep volumes -# already appear to exist (mounted volumes with a top-level "keep" -# directory), use them; create temporary volumes if necessary. -# +# Create a Docker data volume 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 + `$DOCKER ps --all |grep -P "keep_data[^/]" -q` + if [[ "$?" == "0" ]]; then + return + fi + docker create -v /keep-data --name keep_data arvados/keep } function do_start { local start_doc=false local start_sso=false local start_api=false + local start_compute=false local start_workbench=false + local start_vm=false + local start_nameserver=false local start_keep=false + local start_keepproxy=false + local # NOTE: This requires GNU getopt (part of the util-linux package on Debian-based distros). - local TEMP=`getopt -o d::s::a::w::kh \ - --long doc::,sso::,api::,workbench::,keep,help,ssh \ + local TEMP=`getopt -o d::s::a::cw::nkpvh \ + --long doc::,sso::,api::,compute,workbench::,nameserver,keep,keepproxy,vm,help \ -n "$0" -- "$@"` if [ $? != 0 ] ; then echo "Use -h for help"; exit 1 ; fi @@ -164,19 +158,30 @@ function do_start { *) start_api=$2; shift 2 ;; esac ;; + -c | --compute) + start_compute=2 + shift + ;; -w | --workbench) case "$2" in "") start_workbench=9899; shift 2 ;; *) start_workbench=$2; shift 2 ;; esac ;; - -k | --keep ) + -v | --vm) + start_vm=true + shift + ;; + -n | --nameserver) + start_nameserver=true + shift + ;; + -k | --keep) start_keep=true shift ;; - --ssh) - # ENABLE_SSH is a global variable - ENABLE_SSH=true + -p | --keepproxy) + start_keepproxy=true shift ;; --) @@ -194,14 +199,51 @@ function do_start { if [[ $start_doc == false && $start_sso == false && $start_api == false && + $start_compute == false && $start_workbench == false && - $start_keep == false ]] + $start_vm == false && + $start_nameserver == false && + $start_keep == false && + $start_keepproxy == false ]] then start_doc=9898 - start_sso=9901 + #the sso server is currently not used by default so don't start it unless explicitly requested + #start_sso=9901 start_api=9900 + start_compute=2 start_workbench=9899 + start_vm=true + start_nameserver=true start_keep=true + start_keepproxy=true + fi + + if [[ $start_nameserver != false ]] + then + # We rely on skydock and skydns for dns discovery between the slurm controller and compute nodes, + # so make sure they are running + $DOCKER ps | grep skydns >/dev/null + if [[ "$?" != "0" ]]; then + echo "Starting crosbymichael/skydns container..." + $DOCKER rm "skydns" 2>/dev/null + echo $DOCKER run -d -p 172.17.42.1:53:53/udp --name skydns crosbymichael/skydns -nameserver 8.8.8.8:53 -domain arvados + $DOCKER run -d -p 172.17.42.1:53:53/udp --name skydns crosbymichael/skydns -nameserver 8.8.8.8:53 -domain arvados + fi + $DOCKER ps | grep skydock >/dev/null + if [[ "$?" != "0" ]]; then + echo "Starting crosbymichael/skydock container..." + $DOCKER rm "skydock" 2>/dev/null + echo $DOCKER run -d -v /var/run/docker.sock:/docker.sock --name skydock crosbymichael/skydock -ttl 30 -environment dev -s /docker.sock -domain arvados -name skydns + $DOCKER run -d -v /var/run/docker.sock:/docker.sock --name skydock crosbymichael/skydock -ttl 30 -environment dev -s /docker.sock -domain arvados -name skydns + fi + + echo + echo "*****************************************************************" + echo "To access Arvados using command line tools on the host we recommend you add" + echo "the arvados nameserver to the top of your DNS configuration in /etc/resolv.conf:" + echo "nameserver 172.17.42.1" + echo "*****************************************************************" + echo fi if [[ $start_sso != false ]] @@ -211,7 +253,18 @@ function do_start { if [[ $start_api != false ]] then + if [[ $start_sso != false ]]; then start_container "$start_api:443" "api_server" '' "sso_server:sso" "arvados/api" + else + start_container "$start_api:443" "api_server" '' '' "arvados/api" + fi + fi + + if [[ $start_compute != false ]] + then + for i in `seq 0 $(($start_compute - 1))`; do + start_container "" "compute" '' "api_server:api" "arvados/compute" + done fi if [[ $start_keep != false ]] @@ -219,51 +272,68 @@ function do_start { # 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" \ + "keep_data" \ "api_server:api" \ "arvados/keep" start_container "25108:25107" "keep_server_1" \ - "${keep_volumes[1]}:/dev/keep-0" \ + "keep_data" \ "api_server:api" \ "arvados/keep" fi + if [[ $start_keepproxy != false ]] + then + start_container "9902:9100" "keepproxy_server" '' \ + "api_server:api" \ + "arvados/keepproxy" + fi + if [[ $start_doc != false ]] then start_container "$start_doc:80" "doc_server" '' '' "arvados/doc" fi + if [[ $start_vm != false ]] + then + start_container "" "shell" '' "api_server:api" "arvados/shell" + 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 + if [[ $start_api != false ]] then - cat >$HOME/.config/arvados/settings.conf <$HOME/.config/arvados/settings.conf </dev/null } @@ -347,6 +430,22 @@ function do_test { done } +function do_reset { + for name in skydock skydns workbench_server shell doc_server keepproxy_server keep_server_0 keep_server_1 compute0 compute1 api_server keepproxy keep_data + do + `$DOCKER ps |grep -P "$name[^/]" -q` + if [[ "$?" == "0" ]]; then + echo " $DOCKER stop $name" + $DOCKER stop $name + fi + `$DOCKER ps --all |grep -P "$name[^/]" -q` + if [[ "$?" == "0" ]]; then + echo " $DOCKER rm $name" + $DOCKER rm $name + fi + done +} + if [ $# -lt 1 ] then usage @@ -371,6 +470,11 @@ case $1 in shift do_test $@ ;; + reset) + shift + do_reset $@ + ;; + *) usage exit 1