[ARVADOS-DEV] updated: 01cf08200a38f781a62283ebb6099f46a5bf13ef

[git at public.curoverse.com]

Summary of changes:
 arvbox/docker/common.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

       via  01cf08200a38f781a62283ebb6099f46a5bf13ef (commit)
      from  db8892cca34b4fcc62c3352d1a8bd828abaa0a3d (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 01cf08200a38f781a62283ebb6099f46a5bf13ef
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Dec 30 16:34:14 2015 -0500

    --frozen based on whether there is Gemfile.lock

diff --git a/arvbox/docker/common.sh b/arvbox/docker/common.sh
index 80fbac3..ffed7fd 100644
--- a/arvbox/docker/common.sh
+++ b/arvbox/docker/common.sh
@@ -3,8 +3,13 @@ export GEM_HOME=/var/lib/arvados/gems
 export GEM_PATH=/var/lib/arvados/gems
 
 run_bundler() {
-    if ! flock /var/lib/arvados/gems.lock bundle install --local --no-deployment --frozen "$@" ; then
-        flock /var/lib/arvados/gems.lock bundle install --no-deployment --frozen "$@"
+    if test -f Gemfile.lock ; then
+        frozen=--frozen
+    else
+        frozen=""
+    fi
+    if ! flock /var/lib/arvados/gems.lock bundle install --local --no-deployment $frozen "$@" ; then
+        flock /var/lib/arvados/gems.lock bundle install --no-deployment $frozen "$@"
     fi
 }
 

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


hooks/post-receive
--