[ARVADOS] updated: 1.3.0-1276-g47b157b69
Git user
git at public.curoverse.com
Tue Jul 9 21:30:52 UTC 2019
Summary of changes:
tools/arvbox/lib/arvbox/docker/service/controller/run | 3 ++-
tools/arvbox/lib/arvbox/docker/service/workbench/run-service | 12 ++++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
via 47b157b69a30ce96a5408a2eabeaea72d48a765c (commit)
from 917c3ca20c36318578c4dfab7de076d97a2f87fe (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 47b157b69a30ce96a5408a2eabeaea72d48a765c
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Tue Jul 9 17:29:40 2019 -0400
Fix arvbox demo build. Add Services.Controller to config.yml
no issue #
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/tools/arvbox/lib/arvbox/docker/service/controller/run b/tools/arvbox/lib/arvbox/docker/service/controller/run
index bf288dc0c..4cc96e8b7 100755
--- a/tools/arvbox/lib/arvbox/docker/service/controller/run
+++ b/tools/arvbox/lib/arvbox/docker/service/controller/run
@@ -54,7 +54,8 @@ Clusters:
ExternalURL: "https://$localip:${services[keep-web-ssl]}/"
Composer:
ExternalURL: "http://$localip:${services[composer]}"
-
+ Controller:
+ ExternalURL: "https://$localip:${services[controller-ssl]}"
NodeProfiles: # to be deprecated in favor of "Services" section
"*":
arvados-controller:
diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
index 1f989f63d..9b139500b 100755
--- a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
@@ -20,10 +20,17 @@ run_bundler --without=development
bundle exec passenger-config build-native-support
bundle exec passenger-config install-standalone-runtime
mkdir -p /usr/src/arvados/apps/workbench/tmp
-RAILS_GROUPS=assets bundle exec rake npm:install
if test "$1" = "--only-deps" ; then
- exit
+ # Workaround for validation that asserts there's a download URL
+ # configured, which breaks rake if it is missing.
+cat >config/application.yml <<EOF
+$RAILS_ENV:
+ keep_web_url: https://example.com/c=%{uuid_or_pdh}
+EOF
+ RAILS_GROUPS=assets bundle exec rake npm:install
+ rm config/application.yml
+ exit
fi
set -u
@@ -53,4 +60,5 @@ EOF
(cd config && /usr/local/lib/arvbox/yml_override.py application.yml)
fi
+RAILS_GROUPS=assets bundle exec rake npm:install
bundle exec rake assets:precompile
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list