[ARVADOS] updated: 1.1.0-163-gbef091f

Git user git at public.curoverse.com
Wed Nov 22 15:31:28 EST 2017


Summary of changes:
 tools/arvbox/bin/arvbox                            |  9 +++++++++
 tools/arvbox/lib/arvbox/docker/Dockerfile.base     |  3 ++-
 tools/arvbox/lib/arvbox/docker/common.sh           |  1 +
 tools/arvbox/lib/arvbox/docker/createusers.sh      |  1 +
 .../{workbench => composer}/log/main/.gitstub      |  0
 .../docker/service/{workbench => composer}/log/run |  0
 .../arvbox/docker/service/{sdk => composer}/run    |  3 +--
 .../lib/arvbox/docker/service/composer/run-service | 22 ++++++++++++++++++++++
 .../lib/arvbox/docker/service/sso/run-service      |  4 ++--
 9 files changed, 38 insertions(+), 5 deletions(-)
 copy tools/arvbox/lib/arvbox/docker/service/{workbench => composer}/log/main/.gitstub (100%)
 copy tools/arvbox/lib/arvbox/docker/service/{workbench => composer}/log/run (100%)
 copy tools/arvbox/lib/arvbox/docker/service/{sdk => composer}/run (68%)
 create mode 100755 tools/arvbox/lib/arvbox/docker/service/composer/run-service

       via  bef091f69353d5a1ec7ef6c4e84f81756023596b (commit)
       via  eb84fae9410b06638de572751c64255ee1ea7997 (commit)
       via  2778384cf0c3315c261bc1d52e6c39dac017a3bd (commit)
      from  3156c76f53b4142beb912cb57fd66e343c9e09d4 (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 bef091f69353d5a1ec7ef6c4e84f81756023596b
Merge: 3156c76 eb84fae
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Wed Nov 22 15:30:56 2017 -0500

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


commit eb84fae9410b06638de572751c64255ee1ea7997
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Wed Nov 22 14:31:53 2017 -0500

    Set composer config.  Bump SSO script for updated passenger.

diff --git a/tools/arvbox/lib/arvbox/docker/service/composer/run-service b/tools/arvbox/lib/arvbox/docker/service/composer/run-service
index 0c24ab9..6578ea5 100755
--- a/tools/arvbox/lib/arvbox/docker/service/composer/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/composer/run-service
@@ -17,5 +17,6 @@ PATH=$PATH:/usr/src/composer/node_modules/.bin
 yarn install
 
 if test "$1" != "--only-deps" ; then
-    exec ng serve --host 0.0.0.0 --port 4200
+    echo "apiEndPoint: https://${localip}:${services[api]}" > /usr/src/composer/src/arvados-configuration.yml
+    exec ng serve --host 0.0.0.0 --port 4200 --env=webdev
 fi
diff --git a/tools/arvbox/lib/arvbox/docker/service/sso/run-service b/tools/arvbox/lib/arvbox/docker/service/sso/run-service
index ee35bb9..1dfffaf 100755
--- a/tools/arvbox/lib/arvbox/docker/service/sso/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/sso/run-service
@@ -16,7 +16,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
 
 if test "$1" = "--only-deps" ; then
     exit
@@ -90,6 +91,5 @@ if test "$1" = "--only-setup" ; then
 fi
 
 exec bundle exec passenger start --port=${services[sso]} \
-     --runtime-dir=/var/lib/passenger \
      --ssl --ssl-certificate=/var/lib/arvados/self-signed.pem \
      --ssl-certificate-key=/var/lib/arvados/self-signed.key

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list