COMPUTE_COUNTER=0
+ARVADOS_DOMAIN=dev.arvados
+
function usage {
echo >&2
echo >&2 "usage: $0 (start|stop|restart|reset|test) [options]"
echo >&2 "test run tests"
echo >&2
echo >&2 "$0 options:"
+ echo >&2 " -b[bridge], --bridge[=bridge] Docker bridge (default bridge docker0)"
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 " -k, --keep Keep servers"
echo >&2 " -p, --keepproxy Keepproxy server"
echo >&2 " -h, --help Display this help and exit"
+ echo >&2 " --domain=dns.domain DNS domain used by containers (default dev.arvados)"
echo >&2
echo >&2 " If no options are given, the action is applied to all servers."
echo >&2
echo `$DOCKER inspect $container |grep IPAddress |cut -f4 -d\"`
}
+function bridge_ip_address {
+ local bridge_name=$1
+ # FIXME: add a more robust check here.
+ # because ip command could be mising, multiple docker bridges could be there.. etc.
+ echo $(ip --oneline --family inet addr show dev "$bridge_name" | awk '{ print $4 }'| cut -d/ -f1 )
+}
+
function start_container {
+ bridge_ip=$(bridge_ip_address "$bridge")
+
local args="-d -i -t"
if [[ "$1" != '' ]]; then
local port="$1"
if [[ "$2" != '' ]]; then
local name="$2"
if [[ "$name" == "api_server" ]]; then
- args="$args --dns=172.17.42.1 --dns-search=compute.dev.arvados --hostname api -P --name $name"
+ args="$args --dns=$bridge_ip --dns-search=compute.$ARVADOS_DOMAIN --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"
+ args="$args --dns=$bridge_ip --dns-search=compute.$ARVADOS_DOMAIN --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"
+ args="$args --dns=$bridge_ip --dns-search=$ARVADOS_DOMAIN --hostname ${name#_server} --name $name"
fi
fi
if [[ "$3" != '' ]]; then
fi
local image=$5
- `$DOCKER ps |grep -P "$name[^/]" -q`
+ `$DOCKER ps |grep -E "\b$name\b" -q`
if [[ "$?" == "0" ]]; then
echo "You have a running container with name $name -- skipping."
return
fi
echo "Starting container: $name"
- `$DOCKER ps --all |grep -P "$name[^/]" -q`
+ `$DOCKER ps --all |grep -E "\b$name\b" -q`
if [[ "$?" == "0" ]]; then
echo " $DOCKER start $name"
container=`$DOCKER start $name`
# Create a Docker data volume
function make_keep_volumes () {
- `$DOCKER ps --all |grep -P "keep_data[^/]" -q`
+ `$DOCKER ps --all |grep -E "\bkeep_data\b" -q`
if [[ "$?" == "0" ]]; then
return
fi
local start_nameserver=false
local start_keep=false
local start_keepproxy=false
+ local bridge="docker0"
local
# NOTE: This requires GNU getopt (part of the util-linux package on Debian-based distros).
- local TEMP=`getopt -o d::s::a::cw::nkpvh \
- --long doc::,sso::,api::,compute,workbench::,nameserver,keep,keepproxy,vm,help \
+ local TEMP=`getopt -o d::s::b:a::cw::nkpvh \
+ --long doc::,sso::,api::,bridge:,compute,workbench::,nameserver,keep,keepproxy,vm,help,domain:: \
-n "$0" -- "$@"`
if [ $? != 0 ] ; then echo "Use -h for help"; exit 1 ; fi
while [ $# -ge 1 ]
do
case $1 in
+ -b | --bridge)
+ case "$2" in
+ *) start_bridge=$2; shift 2 ;;
+ esac
+ ;;
-d | --doc)
case "$2" in
"") start_doc=9898; shift 2 ;;
start_keepproxy=true
shift
;;
+ --domain)
+ case "$2" in
+ *) ARVADOS_DOMAIN="$2"; shift 2 ;;
+ esac
+ ;;
--)
shift
break
$start_keepproxy == false ]]
then
start_doc=9898
- #the sso server is currently not used by default so don't start it unless explicitly requested
- #start_sso=9901
+ start_sso=9901
start_api=9900
start_compute=2
start_workbench=9899
- start_vm=true
+ #start_vm=true
start_nameserver=true
start_keep=true
start_keepproxy=true
if [[ $start_nameserver != false ]]
then
+ $DOCKER ps | grep skydns >/dev/null
+ need_skydns="$?"
+
+ $DOCKER ps | grep skydock >/dev/null
+ need_skydock="$?"
+
+ if [[ "$need_skydns" != 0 || "$need_skydock" != 0 ]]
+ then
+ # skydns and skydock need to both be running before everything else.
+ # If they are not running we need to shut everything down and start
+ # over, otherwise DNS will be broken and the containers won't find each other.
+ do_stop
+ need_skydns=1
+ need_skydock=1
+ fi
+
# 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
+ if [[ $need_skydns != "0" ]]; then
+ echo "Detecting bridge '$bridge' IP for crosbymichael/skydns"
+ bridge_ip=$(bridge_ip_address "$bridge")
+
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
+ echo $DOCKER run -d -p $bridge_ip:53:53/udp --name skydns crosbymichael/skydns -nameserver 8.8.8.8:53 -domain arvados
+ $DOCKER run -d -p $bridge_ip: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
+ if [[ "$need_skydock" != "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
if [[ $start_workbench != false ]]
then
- start_container "$start_workbench:80" "workbench_server" '' "api_server:api" "arvados/workbench"
+ start_container "" "workbench_server" '' "" "arvados/workbench"
fi
if [[ $start_api != false ]]
fi
fi
- `cat /etc/resolv.conf |grep -P "nameserver 172\.17\.42\.1" -q`
- if [[ "$?" == "1" ]]; then
+ if [ "$(awk '($1 == "nameserver"){print $2; exit}' </etc/resolv.conf)" != "$bridge_ip" ]; then
echo
echo "******************************************************************"
echo "To access Arvados you must add the Arvados nameserver to the top"
echo "of your DNS configuration in /etc/resolv.conf:"
- echo "nameserver 172.17.42.1"
+ echo "nameserver $bridge_ip"
echo
echo "Then run '$0 start' again"
echo "******************************************************************"
echo
else
- while ! $CURL -L -f http://workbench.dev.arvados >/dev/null 2>/dev/null ; do
+ while ! $CURL -k -L -f http://workbench.$ARVADOS_DOMAIN >/dev/null 2>/dev/null ; do
echo "Waiting for Arvados to be ready."
sleep 1
done
- `$DOCKER ps |grep -P "doc_server[^/]" -q`
+ `$DOCKER ps |grep -E "\bdoc_server\b" -q`
if [[ "$?" == "0" ]]; then
echo
echo "******************************************************************"
- echo "You can access the Arvados documentation at http://doc.dev.arvados"
+ echo "You can access the Arvados documentation at http://doc.$ARVADOS_DOMAIN"
echo "******************************************************************"
echo
fi
- `$DOCKER ps |grep -P "workbench_server[^/]" -q`
+ `$DOCKER ps |grep -E "\bworkbench_server\b" -q`
if [[ "$?" == "0" ]]; then
echo
echo "********************************************************************"
- echo "You can access the Arvados workbench at http://workbench.dev.arvados"
+ echo "You can access the Arvados workbench at http://workbench.$ARVADOS_DOMAIN"
echo "********************************************************************"
echo
fi
# NOTE: This requires GNU getopt (part of the util-linux package on Debian-based distros).
local TEMP=`getopt -o dsacwnkpvh \
- --long doc,sso,api,compute,workbench,nameserver,keep,keepproxy,vm,help \
+ --long doc,sso,api,compute,workbench,nameserver,keep,keepproxy,vm,help,domain:: \
-n "$0" -- "$@"`
if [ $? != 0 ] ; then echo "Use -h for help"; exit 1 ; fi
-a | --api)
stop_api=api_server ; shift ;;
-c | --compute)
- stop_compute=`$DOCKER ps |grep -P "compute\d+" |grep -v api_server |cut -f1 -d ' '` ; shift ;;
+ stop_compute=`$DOCKER ps |grep -E "\bcompute[0-9]+\b" |grep -v api_server |cut -f1 -d ' '` ; shift ;;
-w | --workbench)
stop_workbench=workbench_server ; shift ;;
-n | --nameserver )
stop_keep="keep_server_0 keep_server_1" ; shift ;;
-p | --keepproxy )
stop_keep="keepproxy_server" ; shift ;;
+ --domain)
+ case "$2" in
+ *) ARVADOS_DOMAIN="$2"; shift 2 ;;
+ esac
+ ;;
--)
shift
break
stop_doc=doc_server
stop_sso=sso_server
stop_api=api_server
- stop_compute=`$DOCKER ps |grep -P "compute\d+" |grep -v api_server |cut -f1 -d ' '`
+ stop_compute=`$DOCKER ps |grep -E "\bcompute[0-9]+\b" |grep -v api_server |cut -f1 -d ' '`
stop_workbench=workbench_server
stop_vm=shell
stop_nameserver="skydock skydns"
}
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
+ 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 sso_server
do
- `$DOCKER ps |grep -P "$name[^/]" -q`
+ `$DOCKER ps |grep -E "\b$name\b" -q`
if [[ "$?" == "0" ]]; then
echo " $DOCKER stop $name"
$DOCKER stop $name
fi
- `$DOCKER ps --all |grep -P "$name[^/]" -q`
+ `$DOCKER ps --all |grep -E "\b$name\b" -q`
if [[ "$?" == "0" ]]; then
echo " $DOCKER rm $name"
$DOCKER rm $name
projects / arvados.git / blobdiff