[ARVADOS] updated: 1.3.0-1428-gdde5e6052

[Git user]

Summary of changes:
 doc/install/install-composer.html.textile.liquid   | 34 +++++++++++++---------
 .../lib/arvbox/docker/service/composer/run-service |  2 +-
 2 files changed, 22 insertions(+), 14 deletions(-)

       via  dde5e6052a0b7547978d105ef3dfb5bf4a58eeda (commit)
       via  0128e9d05f42469364aae8ca0eeae18b8abbe74b (commit)
       via  d0ecfaefd9ed9fab71e0cd8d62579a208f0eec5d (commit)
      from  adedc9a3791fbed1d08da4d8681f1d0e0b36e024 (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 dde5e6052a0b7547978d105ef3dfb5bf4a58eeda
Merge: adedc9a37 0128e9d05
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Wed Jul 31 13:53:10 2019 -0400

    Merge branch '15356-composer-config' refs #15356
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>


commit 0128e9d05f42469364aae8ca0eeae18b8abbe74b
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Wed Jul 31 13:42:08 2019 -0400

    15356: arvbox writes API_HOST to composer.yml
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/tools/arvbox/lib/arvbox/docker/service/composer/run-service b/tools/arvbox/lib/arvbox/docker/service/composer/run-service
index f00b7f776..fffa3daba 100755
--- a/tools/arvbox/lib/arvbox/docker/service/composer/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/composer/run-service
@@ -18,5 +18,5 @@ if test "$1" = "--only-deps" ; then
     exit
 fi
 
-echo "apiEndPoint: https://${localip}:${services[controller-ssl]}" > /usr/src/composer/src/composer.yml
+echo "API_HOST: ${localip}:${services[controller-ssl]}" > /usr/src/composer/src/composer.yml
 exec node_modules/.bin/ng serve --host 0.0.0.0 --port 4200 --env=webdev

commit d0ecfaefd9ed9fab71e0cd8d62579a208f0eec5d
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Wed Jul 31 13:40:47 2019 -0400

    15356: Update Composer install doc
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/doc/install/install-composer.html.textile.liquid b/doc/install/install-composer.html.textile.liquid
index 9bd25ed79..f0938e860 100644
--- a/doc/install/install-composer.html.textile.liquid
+++ b/doc/install/install-composer.html.textile.liquid
@@ -3,8 +3,13 @@ layout: default
 navsection: installguide
 title: Install Composer
 ...
+{% comment %}
+Copyright (C) The Arvados Authors. All rights reserved.
 
-Arvados Composer is a single-page javascript application for building Common Workflow Languge (CWL) Workflows.
+SPDX-License-Identifier: CC-BY-SA-3.0
+{% endcomment %}
+
+Arvados Composer is a web-based javascript application for building Common Workflow Languge (CWL) Workflows.
 
 h2. Prerequisites
 
@@ -30,14 +35,6 @@ On a Red Hat-based system, install the following package:
 
 h2. Configure
 
-h3. composer.yml
-
-Edit @/etc/arvados/composer/composer.yml@ and set @apiEndPoint@ to your API server:
-
-<pre>
-apiEndPoint: https://zzzzz.arvadosapi.com
-</pre>
-
 h3. Nginx
 
 Add Composer to your Nginx configuration.  This example will host Composer at @/composer at .
@@ -49,11 +46,22 @@ location /composer {
 }
 </pre>
 
-h3. Workbench link to composer
+h3. composer.yml
 
-Edit the workbench @application.yml@ and set @composer_url@ to the location from which it is served.
+Create @/var/www/arvados-composer/composer.yml@ and set @API_HOST@ to your API server:
 
 <pre>
-production:
-  composer_url: 'https://workbench.zzzzz.arvadosapi.com/composer'
+API_HOST: zzzzz.arvadosapi.com
 </pre>
+
+h3. Workbench link to composer
+
+Edit @config.yml@ and set @Services.Composer.ExternalURL@ to the location from which it is served:
+
+<notextile>
+<pre><code>Clusters:
+  zzzzz:
+    Services:
+      Composer:
+        ExternalURL: <span class="userinput">https://workbench.zzzzz.arvadosapi.com/composer</span></code></pre>
+</notextile>

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


hooks/post-receive
--