[ARVADOS] updated: c5c8c8836cf769843e90bb90b8851f151d61b326

[git at public.curoverse.com]

Summary of changes:
 docker/arvdock | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

       via  c5c8c8836cf769843e90bb90b8851f151d61b326 (commit)
       via  f8002c5955444a0eaa2f9a31d11c2187d86e9e61 (commit)
      from  31407b1e131c90895037db4e6b72b8ba00fc874e (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 c5c8c8836cf769843e90bb90b8851f151d61b326
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 ]]

commit f8002c5955444a0eaa2f9a31d11c2187d86e9e61
Author: Ward Vandewege <ward at curoverse.com>
Date:   Mon Nov 3 10:33:54 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.
    
    refs #4383

diff --git a/docker/arvdock b/docker/arvdock
index 3960566..ba86a4d 100755
--- a/docker/arvdock
+++ b/docker/arvdock
@@ -233,7 +233,8 @@ function do_start {
           $start_keep == false ]]
     then
         start_doc=9898
-        start_sso=9901
+        #the sso server is currently not used by default so don't start it unless explicitly requested
+        #start_sso=9901
         start_api=9900
         start_compute=2
         start_workbench=9899

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


hooks/post-receive
--