[ARVADOS] updated: 511daa2d275143d89600f015ee0bb19dcbe5641c

[git at public.curoverse.com]

Summary of changes:
 docker/base/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  511daa2d275143d89600f015ee0bb19dcbe5641c (commit)
      from  b33597e94eec5f21fbbcfa72611a3b36397755d5 (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 511daa2d275143d89600f015ee0bb19dcbe5641c
Author: Nico Cesar <nico at curoverse.com>
Date:   Fri Jun 5 14:54:36 2015 -0400

    bundler 1.10 brakes workbench build because
    
    https://github.com/lucasefe/themes_for_rails/blob/master/themes_for_rails.gemspec
    
    has a bug. And it's a NOTICE in 1.9.9 but its a FATAL in 1.10.x
    
    this is our workaround.
    
    no issue #

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index eac212c..2347da3 100644
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -31,7 +31,7 @@ ADD generated/arvados.tar.gz /usr/src/arvados/
 # Update gem. This (hopefully) fixes
 # https://github.com/rubygems/rubygems.org/issues/613.
 RUN /usr/local/rvm/bin/rvm-exec default gem update --system && \
-    /usr/local/rvm/bin/rvm-exec default gem install bundler && \
+    /usr/local/rvm/bin/rvm-exec default gem install bundler  -v 1.9.9 && \
     /usr/local/rvm/bin/rvm-exec default bundle install --gemfile=/usr/src/arvados/apps/workbench/Gemfile && \
     /usr/local/rvm/bin/rvm-exec default bundle install --gemfile=/usr/src/arvados/services/api/Gemfile && \
     /usr/local/rvm/bin/rvm-exec default bundle install --gemfile=/usr/src/arvados/doc/Gemfile

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


hooks/post-receive
--