[ARVADOS] updated: 1.1.3-200-g787e1ba
Git user
git at public.curoverse.com
Tue Mar 13 16:23:49 EDT 2018
Summary of changes:
tools/arvbox/lib/arvbox/docker/service/workbench/run | 4 ++--
tools/arvbox/lib/arvbox/docker/service/workbench/run-service | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
via 787e1ba7d88bf854836c1ba75401447358ed4196 (commit)
from 80081626101a2193d7b916fe488903b66777576e (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 787e1ba7d88bf854836c1ba75401447358ed4196
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Tue Mar 13 16:23:17 2018 -0400
Fix arvbox workbench for updated passenger, refs #12737
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench/run b/tools/arvbox/lib/arvbox/docker/service/workbench/run
index d90a2e2..5615884 100755
--- a/tools/arvbox/lib/arvbox/docker/service/workbench/run
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench/run
@@ -22,6 +22,6 @@ else
fi
if test "$1" != "--only-deps" ; then
- exec bundle exec passenger start --port 80 \
- --user arvbox --runtime-dir=/var/lib/passenger
+ exec bundle exec passenger start --port=${services[workbench]} \
+ --user arvbox
fi
diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
index e5bd014..09d77e0 100755
--- a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
@@ -17,7 +17,8 @@ else
fi
run_bundler --without=development
-bundle exec passenger start --runtime-check-only --runtime-dir=/var/lib/passenger
+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
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list