From: Nico Cesar <nico@curoverse.com>
Date: Fri, 5 Jun 2015 18:54:36 +0000 (-0400)
Subject: bundler 1.10 brakes workbench build because
X-Git-Tag: 1.1.0~1566
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/511daa2d275143d89600f015ee0bb19dcbe5641c

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 eac212c908..2347da355b 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