X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ee0896bf5bf1f7f4ebdc5168e928c28d9f06eaeb..c51634cad3c68d0a8400f1b1c47da9eef5307e06:/docker/arvdock diff --git a/docker/arvdock b/docker/arvdock index 9336ae1583..e36e5cfd59 100755 --- a/docker/arvdock +++ b/docker/arvdock @@ -18,7 +18,8 @@ function usage { 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[count], --compute[=count] Compute nodes (default starts 2)" + 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 " --ssh Enable SSH access to server containers" @@ -44,14 +45,14 @@ function start_container { if [[ "$2" != '' ]]; then local name="$2" if [[ "$name" == "api_server" ]]; then - args="$args --hostname api -P --name $name" + 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 --hostname compute$COMPUTE_COUNTER -P --privileged --name $name" + 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 --name $name" + args="$args --dns=172.17.42.1 --dns-search=dev.arvados --hostname ${name#_server} --name $name" fi fi if [[ "$3" != '' ]]; then @@ -81,12 +82,12 @@ function start_container { echo "Starting container:" #echo " $DOCKER run --dns=127.0.0.1 $args $image" echo " $DOCKER run $args $image" - container=`$DOCKER run --dns=172.17.42.1 --dns-search=compute.dev.arvados $args $image` - if [[ "$?" != "0" ]]; then + container=`$DOCKER run $args $image` + if [ "$?" != "0" -o "$container" = "" ]; then echo "Unable to start container" exit 1 fi - if $ENABLE_SSH + if [ "$name" == "compute" -o "$ENABLE_SSH" != "false" ]; then ip=$(ip_address $container ) echo @@ -94,6 +95,8 @@ function start_container { echo echo " ssh root@$ip" echo + else + echo "Started container: $container" fi if [[ "$name" == "doc_server" ]]; then @@ -146,12 +149,13 @@ function do_start { local start_api=false local start_compute=false local start_workbench=false + local start_vm=false local start_nameserver=false local start_keep=false # NOTE: This requires GNU getopt (part of the util-linux package on Debian-based distros). - local TEMP=`getopt -o d::s::a::c::w::nkh \ - --long doc::,sso::,api::,compute::,workbench::,nameserver,keep,help,ssh \ + local TEMP=`getopt -o d::s::a::cw::nkvh \ + --long doc::,sso::,api::,compute,workbench::,nameserver,keep,vm,help,ssh \ -n "$0" -- "$@"` if [ $? != 0 ] ; then echo "Use -h for help"; exit 1 ; fi @@ -181,10 +185,8 @@ function do_start { esac ;; -c | --compute) - case "$2" in - "") start_compute=2; shift 2 ;; - *) start_compute=$2; shift 2 ;; - esac + start_compute=2 + shift ;; -w | --workbench) case "$2" in @@ -192,6 +194,10 @@ function do_start { *) start_workbench=$2; shift 2 ;; esac ;; + -v | --vm) + start_vm=true + shift + ;; -n | --nameserver) start_nameserver=true shift @@ -222,6 +228,7 @@ function do_start { $start_api == false && $start_compute == false && $start_workbench == false && + $start_vm == false && $start_nameserver == false && $start_keep == false ]] then @@ -230,6 +237,7 @@ function do_start { start_api=9900 start_compute=2 start_workbench=9899 + start_vm=true start_nameserver=true start_keep=true fi @@ -248,22 +256,12 @@ function do_start { then # We rely on skydock and skydns for dns discovery between the slurm controller and compute nodes, # so make sure they are running - $DOCKER images | grep skydns >/dev/null - if [[ "$?" != "0" ]]; then - echo "Downloading crosbymichael/skydns..." - $DOCKER pull crosbymichael/skydns - fi $DOCKER ps | grep skydns >/dev/null if [[ "$?" != "0" ]]; then echo "Starting crosbymichael/skydns container..." $DOCKER rm "skydns" 2>/dev/null $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 images | grep skydock >/dev/null - if [[ "$?" != "0" ]]; then - echo "Downloading crosbymichael/skydock..." - $DOCKER pull crosbymichael/skydock - fi $DOCKER ps | grep skydock >/dev/null if [[ "$?" != "0" ]]; then echo "Starting crosbymichael/skydock container..." @@ -289,11 +287,11 @@ function do_start { [ -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_volumes[0]}:/keep-data" \ "api_server:api" \ "arvados/keep" start_container "25108:25107" "keep_server_1" \ - "${keep_volumes[1]}:/dev/keep-0" \ + "${keep_volumes[1]}:/keep-data" \ "api_server:api" \ "arvados/keep" fi @@ -303,6 +301,11 @@ function do_start { 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" @@ -326,11 +329,12 @@ function do_stop { local stop_compute="" local stop_workbench="" local stop_nameserver="" + local stop_vm="" local stop_keep="" # NOTE: This requires GNU getopt (part of the util-linux package on Debian-based distros). - local TEMP=`getopt -o dsacwnkh \ - --long doc,sso,api,compute,workbench,nameserver,keep,help \ + local TEMP=`getopt -o dsacwnkvh \ + --long doc,sso,api,compute,workbench,nameserver,keep,vm,help \ -n "$0" -- "$@"` if [ $? != 0 ] ; then echo "Use -h for help"; exit 1 ; fi @@ -352,7 +356,9 @@ function do_stop { -w | --workbench) stop_workbench=workbench_server ; shift ;; -n | --nameserver ) - stop_keep="skydock skydns" ; shift ;; + stop_nameserver="skydock skydns" ; shift ;; + -v | --vm ) + stop_vm="shell" ; shift ;; -k | --keep ) stop_keep="keep_server_0 keep_server_1" ; shift ;; --) @@ -372,6 +378,7 @@ function do_stop { $stop_api == "" && $stop_compute == "" && $stop_workbench == "" && + $stop_vm == "" && $stop_nameserver == "" && $stop_keep == "" ]] then @@ -380,11 +387,12 @@ function do_stop { stop_api=api_server stop_compute=`$DOCKER ps |grep -P "compute\d+" |grep -v api_server |cut -f1 -d ' '` stop_workbench=workbench_server + stop_vm=shell stop_nameserver="skydock skydns" stop_keep="keep_server_0 keep_server_1" fi - $DOCKER stop $stop_doc $stop_sso $stop_api $stop_compute $stop_workbench $stop_nameserver $stop_keep \ + $DOCKER stop $stop_doc $stop_sso $stop_api $stop_compute $stop_workbench $stop_nameserver $stop_keep $stop_vm \ 2>/dev/null }