Merge branch 'master' of git.clinicalfuture.com:arvados

Conflicts:
	docker/build.sh
	docker/config.yml.example

diff --cc docker/build.sh
index e9199d9331f0b8b11d03b9f95e9bc9ad47a8b130,8cea124823233a4134534d653e65981257ee33e2..6fb2d9eba6fd6582ca25f6c0a021e28410c29c22
--- 1/docker/build.sh
--- 2/docker/build.sh
+++ b/docker/build.sh
@@@ -6,7 -6,18 +6,20 @@@
  
  # build the Docker images
  docker build -t arvados/base base
+ 
+ mkdir -p api/generated
+ tar -c -z -f api/generated/api.tar.gz -C ../services api
  docker build -t arvados/api api
+ 
+ mkdir -p docserver/generated
+ tar -c -z -f docserver/generated/doc.tar.gz -C .. doc
  docker build -t arvados/docserver docserver
+ 
+ mkdir -p workbench/generated
+ tar -c -z -f workbench/generated/workbench.tar.gz -C ../apps workbench
  docker build -t arvados/workbench workbench
+ 
+ docker build -t arvados/warehouse warehouse
+ 
++mkdir -p sso/generated
 +docker build -t arvados/sso sso

diff --cc docker/config.yml.example
index 5eab7116e9c1c06d48fc6a677959616099abe628,ade83fda7e4d85eca2c62ad3b025c9feefc6f75e..5247e3738afde797c3a7006dc0ddb6f7cd328805
--- 1/docker/config.yml.example
--- 2/docker/config.yml.example
+++ b/docker/config.yml.example
@@@ -48,13 -49,7 +54,13 @@@ WORKBENCH_VCF_PIPELINE_UUID
  WORKBENCH_SITE_NAME: Arvados Workbench
  WORKBENCH_INSECURE_HTTPS: false
  WORKBENCH_ACTIVATION_CONTACT_LINK: mailto:arvados@clinicalfuture.com
- WORKBENCH_ARVADOS_LOGIN_BASE: https://@@API_HOSTNAME@@.arvadosapi.com/login
- WORKBENCH_ARVADOS_V1_BASE: https://@@API_HOSTNAME@@.arvadosapi.com/arvados/v1
+ WORKBENCH_ARVADOS_LOGIN_BASE: https://@@API_HOSTNAME@@.@@ARVADOS_DOMAIN@@/login
+ WORKBENCH_ARVADOS_V1_BASE: https://@@API_HOSTNAME@@.@@ARVADOS_DOMAIN@@/arvados/v1
 -# /Workbench settings
 +WORKBENCH_SECRET:
- # /Workbench settings
  
- # /SSO settings
++# ==============================
 +# SSO settings
++# ==============================
 +SSO_HOSTNAME: sso
 +SSO_SECRET:
 +SSO_CLIENT_SECRET: