[ARVADOS] updated: 1.1.1-262-g71a8359

[Git user]

Summary of changes:
 tools/arvbox/lib/arvbox/docker/common.sh                     | 1 +
 tools/arvbox/lib/arvbox/docker/service/composer/run-service  | 2 +-
 tools/arvbox/lib/arvbox/docker/service/workbench/run-service | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

       via  71a83590c5d6804a98d8fa3203acba69820814d8 (commit)
      from  6cae747c4bd57a2787e943cbc87b95e9cc1015a0 (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 71a83590c5d6804a98d8fa3203acba69820814d8
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Dec 15 09:25:32 2017 -0500

    Add composer_url to arvbox workbench config refs #12377
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/tools/arvbox/lib/arvbox/docker/common.sh b/tools/arvbox/lib/arvbox/docker/common.sh
index 466ef1f..c5e1523 100644
--- a/tools/arvbox/lib/arvbox/docker/common.sh
+++ b/tools/arvbox/lib/arvbox/docker/common.sh
@@ -53,6 +53,7 @@ run_bundler() {
         else
             flock /var/lib/gems/gems.lock gem install --no-document bundler
         fi
+        ln -sf /var/lib/gems/bin/bundle /usr/local/bin
     fi
     if ! flock /var/lib/gems/gems.lock bundle install --path $GEM_HOME --local --no-deployment $frozen "$@" ; then
         flock /var/lib/gems/gems.lock bundle install --path $GEM_HOME --no-deployment $frozen "$@"
diff --git a/tools/arvbox/lib/arvbox/docker/service/composer/run-service b/tools/arvbox/lib/arvbox/docker/service/composer/run-service
index 71b9b1c..ac4441d 100755
--- a/tools/arvbox/lib/arvbox/docker/service/composer/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/composer/run-service
@@ -10,7 +10,7 @@ set -ex -o pipefail
 
 cd /usr/src/composer
 
-npm install yarn
+npm -d install yarn
 
 PATH=$PATH:/usr/src/composer/node_modules/.bin
 
diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
index 885385a..e5bd014 100755
--- a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
@@ -46,6 +46,7 @@ $RAILS_ENV:
   keep_web_url: http://$localip:${services[keep-web]}/c=%{uuid_or_pdh}
   arvados_docsite: http://$localip:${services[doc]}/
   force_ssl: false
+  composer_url: http://$localip:${services[composer]}
 EOF
 
 bundle exec rake assets:precompile

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


hooks/post-receive
--