[ARVADOS] updated: 3978e8ae9c1b5bbc07c63fd062e189a81e52399c

[git at public.curoverse.com]

Summary of changes:
 docker/arvdock | 4 ++++
 1 file changed, 4 insertions(+)

       via  3978e8ae9c1b5bbc07c63fd062e189a81e52399c (commit)
      from  ae96829cc088d18c7aaf438eacb75830c7a40662 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 3978e8ae9c1b5bbc07c63fd062e189a81e52399c
Author: Ward Vandewege <ward at curoverse.com>
Date:   Mon Nov 3 13:31:26 2014 -0500

    The sso server docker image is not used by default at the moment, so
    arvdock shouldn't try to start it unless explicitly requested (part 2).
    
    refs #4383

diff --git a/docker/arvdock b/docker/arvdock
index ba86a4d..27b7085 100755
--- 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 ]]

-----------------------------------------------------------------------


hooks/post-receive
--