Merge branch 'master' of git.clinicalfuture.com:arvados into 1692-redesign-dashboard

[arvados.git] / docker / workbench / production.rb.in

diff --git a/docker/workbench/production.rb.in b/docker/workbench/production.rb.in
index f056dcf5789101d6a286d486c21380d0241c79b9..0e5005d21f292f25db942e5cadc349b9ca18dd23 100644 (file)
--- a/docker/workbench/production.rb.in
+++ b/docker/workbench/production.rb.in
@@ -65,8 +65,9 @@ ArvadosWorkbench::Application.configure do
   # with SQLite, MySQL, and PostgreSQL)
   # config.active_record.auto_explain_threshold_in_seconds = 0.5
 
-  config.arvados_login_base = '@@WORKBENCH_ARVADOS_LOGIN_BASE@@'
-  config.arvados_v1_base = '@@WORKBENCH_ARVADOS_V1_BASE@@'
+  config.arvados_login_base = 'https://' + ENV['API_PORT_443_TCP_ADDR'].to_s + '/login'
+  config.arvados_v1_base = 'https://' + ENV['API_PORT_443_TCP_ADDR'].to_s + '/arvados/v1'
+
   config.arvados_insecure_https = @@WORKBENCH_INSECURE_HTTPS@@ # true = do not check server certificate
 
   config.data_import_dir = '@@WORKBENCH_DATA_IMPORT_DIR@@'