projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
7167: when the config file does not contain '/', use $HOME/.config/arvados/<filename>.
[arvados.git]
/
docker
/
arvdock
diff --git
a/docker/arvdock
b/docker/arvdock
index 2fca7fb553981b4c28d5664266d3da02a0778aab..43a384ea497e2cbde1a85b29b1c887edeeb814d5 100755
(executable)
--- a/
docker/arvdock
+++ b/
docker/arvdock
@@
-34,6
+34,7
@@
function usage {
echo >&2 " -k, --keep Keep servers"
echo >&2 " -p, --keepproxy Keepproxy server"
echo >&2 " -h, --help Display this help and exit"
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 >&2
echo >&2 " If no options are given, the action is applied to all servers."
echo >&2
@@
-133,7
+134,7
@@
function do_start {
# NOTE: This requires GNU getopt (part of the util-linux package on Debian-based distros).
local TEMP=`getopt -o d::s::b:a::cw::nkpvh \
# NOTE: This requires GNU getopt (part of the util-linux package on Debian-based distros).
local TEMP=`getopt -o d::s::b:a::cw::nkpvh \
- --long doc::,sso::,api::,bridge:,compute,workbench::,nameserver,keep,keepproxy,vm,help \
+ --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
-n "$0" -- "$@"`
if [ $? != 0 ] ; then echo "Use -h for help"; exit 1 ; fi
@@
-193,6
+194,11
@@
function do_start {
start_keepproxy=true
shift
;;
start_keepproxy=true
shift
;;
+ --domain)
+ case "$2" in
+ *) ARVADOS_DOMAIN="$2"; shift 2 ;;
+ esac
+ ;;
--)
shift
break
--)
shift
break
@@
-388,7
+394,7
@@
function do_stop {
# NOTE: This requires GNU getopt (part of the util-linux package on Debian-based distros).
local TEMP=`getopt -o dsacwnkpvh \
# 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
-n "$0" -- "$@"`
if [ $? != 0 ] ; then echo "Use -h for help"; exit 1 ; fi
@@
-417,6
+423,11
@@
function do_stop {
stop_keep="keep_server_0 keep_server_1" ; shift ;;
-p | --keepproxy )
stop_keep="keepproxy_server" ; shift ;;
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
--)
shift
break