projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Increase the timeout on "lots of events" websocket test. refs #4295
[arvados.git]
/
docker
/
arvdock
diff --git
a/docker/arvdock
b/docker/arvdock
index 18472cf9b7f41235180f8020988cf97738c62d79..e36e5cfd597cb06c7f0a89646eb6838177a0655a 100755
(executable)
--- a/
docker/arvdock
+++ b/
docker/arvdock
@@
-18,7
+18,7
@@
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 " -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 " -v, --vm Shell server"
echo >&2 " -n, --nameserver Nameserver"
echo >&2 " -k, --keep Keep servers"
@@
-83,11
+83,11
@@
function start_container {
#echo " $DOCKER run --dns=127.0.0.1 $args $image"
echo " $DOCKER run $args $image"
container=`$DOCKER run $args $image`
#echo " $DOCKER run --dns=127.0.0.1 $args $image"
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
echo "Unable to start container"
exit 1
fi
- if [
[ "$name" == "compute" || $ENABLE_SSH ]
];
+ if [
"$name" == "compute" -o "$ENABLE_SSH" != "false"
];
then
ip=$(ip_address $container )
echo
then
ip=$(ip_address $container )
echo
@@
-95,6
+95,8
@@
function start_container {
echo
echo " ssh root@$ip"
echo
echo
echo " ssh root@$ip"
echo
+ else
+ echo "Started container: $container"
fi
if [[ "$name" == "doc_server" ]]; then
fi
if [[ "$name" == "doc_server" ]]; then
@@
-152,8
+154,8
@@
function do_start {
local start_keep=false
# NOTE: This requires GNU getopt (part of the util-linux package on Debian-based distros).
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::nkvh \
- --long doc::,sso::,api::,compute
::
,workbench::,nameserver,keep,vm,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
-n "$0" -- "$@"`
if [ $? != 0 ] ; then echo "Use -h for help"; exit 1 ; fi
@@
-183,10
+185,8
@@
function do_start {
esac
;;
-c | --compute)
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
;;
-w | --workbench)
case "$2" in
@@
-256,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
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 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..."
$DOCKER ps | grep skydock >/dev/null
if [[ "$?" != "0" ]]; then
echo "Starting crosbymichael/skydock container..."
@@
-297,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" \
[ -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" \
"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
"api_server:api" \
"arvados/keep"
fi