* Mention SSO server to documentation in README

* Fix up SSO and API server configuration to allow API and SSO server to communicate

diff --git a/docker/README b/docker/README
index e5642831b010f8f8cb7fe68159638132130cfaa5..033d7495566b154100dcfbab3b6d4a07d375d39a 100644 (file)
--- a/docker/README
+++ b/docker/README
@@ -35,6 +35,7 @@ BUILDING
      arvados/docserver - Arvados documentation
      arvados/warehouse - Keep, the Arvados content-addressable filesystem
      arvados/workbench - the Arvados console
+     arvados/sso       - the Arvados single-signon authentication server
 
    You may also build Docker images for individual Arvados services:
 
@@ -42,6 +43,7 @@ BUILDING
      make docserver-image
      make warehouse-image
      make workbench-image
+     make sso-image
 
 DEPLOYING
 ---------

diff --git a/docker/api/omniauth.rb.in b/docker/api/omniauth.rb.in
index 5a15d9ff543bfb7f792b851de8df6bacec538936..613f72d1b966a366940d162d6e910a6ecc59e2d2 100644 (file)
--- a/docker/api/omniauth.rb.in
+++ b/docker/api/omniauth.rb.in
@@ -4,7 +4,10 @@ APP_ID = '@@SSO_CLIENT_APP_ID@@'
 APP_SECRET = '@@SSO_CLIENT_SECRET@@'
 
 # Update your custom Omniauth provider URL here
-CUSTOM_PROVIDER_URL = '@@OMNIAUTH_URL@@'
+CUSTOM_PROVIDER_URL = 'https://' + ENV['SSO_PORT_443_TCP_ADDR'].to_s
+
+# This is a development sandbox, we use self-signed certificates
+OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
 
 Rails.application.config.middleware.use OmniAuth::Builder do
   provider :josh_id, APP_ID, APP_SECRET, CUSTOM_PROVIDER_URL

diff --git a/docker/run.sh b/docker/run.sh
index afb90646071bd714fac6d72fa4c886f7ed524f44..68db7bd07d26929ab6fe55e962496760e025ff06 100755 (executable)
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -4,11 +4,13 @@
 echo "Starting documentation server: http://localhost:9898"
 docker run -d -i -t -p 9898:80 arvados/docserver
 
+echo "Starting sso server:     https://localhost:9901"
+docker run -d -i -t -p 9901:443 -name sso_server arvados/sso
+
 echo "Starting api server:     https://localhost:9900"
-docker run -d -i -t -p 9900:443 arvados/api
+docker run -d -i -t -p 9900:443 -link sso_server:sso arvados/api
 
 echo "Starting workbench server:     http://localhost:9899"
 docker run -d -i -t -p 9899:80 arvados/workbench
 
-echo "Starting sso server:     https://localhost:9901"
-docker run -d -i -t -p 9901:443 arvados/sso
+

diff --git a/docker/sso/seeds.rb.in b/docker/sso/seeds.rb.in
index 0aa161d49707554484bc2b4183f835de94758cf4..b35b9396b6041651f145233651d9ea44b188c148 100644 (file)
--- a/docker/sso/seeds.rb.in
+++ b/docker/sso/seeds.rb.in
@@ -1,10 +1,9 @@
 
 Client.delete_all
 
-Client.create(
-  :name => "@@SSO_CLIENT_NAME@@",
-  :app_id => "@@SSO_CLIENT_APP_ID@@",
-  :app_secret => "@@SSO_CLIENT_SECRET@@"
-)
-
+c = Client.new()
+c.name = "@@SSO_CLIENT_NAME@@"
+c.app_id = "@@SSO_CLIENT_APP_ID@@"
+c.app_secret = "@@SSO_CLIENT_SECRET@@"
+c.save!