3991: Set workbench_address in docker config.

diff --git a/docker/api/application.yml.in b/docker/api/application.yml.in
index 355c4e5f94be8aa4ceda83272daffd00433e311b..a60b4e6826c609591f46d080c5a6954de20de099 100644 (file)
--- a/docker/api/application.yml.in
+++ b/docker/api/application.yml.in
@@ -56,6 +56,8 @@ production:
   action_mailer.raise_delivery_errors: false
   action_mailer.perform_deliveries: false
 
+  workbench_address: @@API_WORKBENCH_ADDRESS@@
+
 test:
   uuid_prefix: zzzzz
   secret_token: <%= rand(2**512).to_s(36) %>

diff --git a/docker/build_tools/build.rb b/docker/build_tools/build.rb
index e7f2b7db1af625fff846f95ba93a5dd14b7ecced..cda865114822fedbe21964a18b411ec4ecf1c251 100755 (executable)
--- a/docker/build_tools/build.rb
+++ b/docker/build_tools/build.rb
@@ -84,6 +84,7 @@ def main options
       config['API_AUTO_ADMIN_USER'] = admin_email_address
       config['ARVADOS_USER_NAME'] = user_name
       config['API_HOSTNAME'] = generate_api_hostname
+      config['API_WORKBENCH_ADDRESS'] = 'http://localhost:9899'
       config['PUBLIC_KEY_PATH'] = find_or_create_ssh_key(config['API_HOSTNAME'])
       config.each_key do |var|
         config_out.write "#{var}: #{config[var]}\n"

diff --git a/docker/config.yml.example b/docker/config.yml.example
index 0765f2f8aa2c2dd6f06f2ca38f68c9696e09f6e5..6ba5bcf3113cd482f763ee1ec2ac34206f73af83 100644 (file)
--- a/docker/config.yml.example
+++ b/docker/config.yml.example
@@ -32,6 +32,11 @@ API_HOSTNAME:           # e.g. qr1hi
 # should be an address associated with a Google account.
 API_AUTO_ADMIN_USER:
 
+# The location of the Workbench application where users should be
+# redirected if they point their browsers at the API server, e.g.,
+# https://localhost:9899
+API_WORKBENCH_ADDRESS:
+
 # If a _PW variable is set to an empty string, a password
 # will be chosen randomly at build time. This is the
 # recommended setting.