projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ae96829
)
The sso server docker image is not used by default at the moment, so
author
Ward Vandewege <ward@curoverse.com>
Mon, 3 Nov 2014 18:31:26 +0000
(13:31 -0500)
committer
Ward Vandewege <ward@curoverse.com>
Mon, 3 Nov 2014 18:31:55 +0000
(13:31 -0500)
arvdock shouldn't try to start it unless explicitly requested (part 2).
refs #4383
docker/arvdock
patch
|
blob
|
history
diff --git
a/docker/arvdock
b/docker/arvdock
index ba86a4dd2a34f8af5f90d7a7a0bb2f492f74d40a..27b7085ef164499730fa3050e83f6b016076e23f 100755
(executable)
--- a/
docker/arvdock
+++ b/
docker/arvdock
@@
-250,7
+250,11
@@
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_nameserver != false ]]