Force installation of bundler

fix for https://github.com/rubygems/rubygems/issues/2058

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index 3d99e0ca7e65c4cd5c416e2ead0232669436a5d5..96873c09dc822f084e69cce33415aa35c9604bb0 100644 (file)
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -80,7 +80,7 @@ RUN echo 'gem: --no-document' >> /usr/local/etc/gemrc &&\
 
 RUN gem update --system
 
-RUN gem install bundler &&\
+RUN gem install bundler --force &&\
     rm -rf /usr/local/share/ri/2.4.2/system &&\
     cd / && git clone https://github.com/SamSaffron/pups.git
 

diff --git a/image/discourse_fast_switch/create_switch.rb b/image/discourse_fast_switch/create_switch.rb
index 7f37b8c19d7a28515c1cd630b470203478828bf6..1db4072ec5176e6c0c5cb50e83957b3d89f5ce13 100644 (file)
--- a/image/discourse_fast_switch/create_switch.rb
+++ b/image/discourse_fast_switch/create_switch.rb
@@ -25,6 +25,6 @@ RUBY
 )
 
   system("chmod +x #{bin}")
-  system("use_#{v} && gem update --system && gem install bundler")
+  system("use_#{v} && gem update --system && gem install bundler --force")
   system("use_#{v} && cd /var/www/discourse && sudo -u discourse bundle install --deployment --without test --without development")
 end

diff --git a/image/discourse_test/Dockerfile b/image/discourse_test/Dockerfile
index 8ae00aa2527ace24c37783c59a46d07fca485554..4bb81e319ddde880447139d0032d01d3198381ac 100644 (file)
--- a/image/discourse_test/Dockerfile
+++ b/image/discourse_test/Dockerfile
@@ -5,7 +5,7 @@ FROM discourse/base:$tag
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
-RUN gem update bundler &&\
+RUN gem update bundler --force &&\
       cd /var/www/discourse &&\
       chown -R discourse . &&\
       rm -fr .bundle &&\