[ARVADOS] created: 7dc3629f56be26c71fd70de91765763dd0fb50cd

[Git user]

        at  7dc3629f56be26c71fd70de91765763dd0fb50cd (commit)


commit 7dc3629f56be26c71fd70de91765763dd0fb50cd
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Dec 2 10:50:15 2016 -0500

    5737: Update arvbox to use 2.3.1 and passenger 5.0

diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.base b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
index a894350..aceb30c 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -27,11 +27,11 @@ RUN cd /usr/local && \
 
 ENV PATH ${PATH}:/usr/local/go/bin
 
-ENV RUBYVERSION 2.1.8
+ENV RUBYVERSION 2.3.1
 
 # Install Ruby from source
 RUN cd /usr/local/lib && \
- curl -O http://cache.ruby-lang.org/pub/ruby/2.1/ruby-${RUBYVERSION}.tar.gz && \
+ curl -O http://cache.ruby-lang.org/pub/ruby/2.3/ruby-${RUBYVERSION}.tar.gz && \
  tar xzf ruby-${RUBYVERSION}.tar.gz && \
  cd ruby-${RUBYVERSION} && \
  ./configure --disable-install-doc && \
diff --git a/tools/arvbox/lib/arvbox/docker/service/api/run-service b/tools/arvbox/lib/arvbox/docker/service/api/run-service
index a36205c..5f72f1c 100755
--- a/tools/arvbox/lib/arvbox/docker/service/api/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/api/run-service
@@ -9,7 +9,8 @@ cd /usr/src/arvados/services/api
 export RAILS_ENV=development
 
 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
@@ -23,6 +24,5 @@ if test "$1" = "--only-setup" ; then
 fi
 
 exec bundle exec passenger start --port=${services[api]} \
-                  --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
--