From 9da5d8abd8c2fdfff3ec63df416b911d4170c77f Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Sun, 12 Nov 2017 01:07:05 +0100 Subject: [PATCH] Force installation of bundler fix for https://github.com/rubygems/rubygems/issues/2058 --- image/base/Dockerfile | 2 +- image/discourse_fast_switch/create_switch.rb | 2 +- image/discourse_test/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/image/base/Dockerfile b/image/base/Dockerfile index 3d99e0c..96873c0 100644 --- 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 7f37b8c..1db4072 100644 --- 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 8ae00aa..4bb81e3 100644 --- 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 &&\ -- 2.25.1