latest rubygems has problems

rubygems/bundler#4602
discourse · May 23, 2016 · 2f36b7c · 2f36b7c
1 parent 49b852c
commit 2f36b7c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/image/base/Dockerfile b/image/base/Dockerfile
@@ -1,5 +1,5 @@
 # NAME:     discourse_base
-# VERSION:  1.3.1
+# VERSION:  1.3.2
 
 FROM ubuntu:16.04
 
@@ -8,7 +8,7 @@ ENV PG_VERSION 9.5.3-1.pgdg16.04+1
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
-RUN echo "1.3.0" > /VERSION
+RUN echo "1.3.2" > /VERSION
 
 RUN apt-get update && apt-get install -y lsb-release sudo curl
 RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections
@@ -74,8 +74,7 @@ RUN echo 'gem: --no-document' >> /usr/local/etc/gemrc &&\
     cd /src/ruby-build && ./install.sh &&\
     cd / && rm -rf /src/ruby-build && ruby-build 2.3.1 /usr/local
 
-RUN gem update --system &&\
-    gem install bundler &&\
+RUN gem install bundler &&\
     rm -rf /usr/local/share/ri/2.3.0/system &&\
     cd / && git clone https://github.com/SamSaffron/pups.git
 

diff --git a/image/build.rb b/image/build.rb
@@ -2,7 +2,7 @@
 #
 require 'pty'
 
-$version = "1.3.1"
+$version = "1.3.2"
 
 $docker_squash = "https://github.com/jwilder/docker-squash/releases/download/v0.2.0/docker-squash-linux-amd64-v0.2.0.tar.gz"
 

diff --git a/image/discourse/Dockerfile b/image/discourse/Dockerfile
@@ -1,5 +1,5 @@
-# Current version 1.3.1
-FROM discourse/base:1.3.1
+# Current version 1.3.2
+FROM discourse/base:1.3.2
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
@@ -15,7 +15,3 @@ RUN useradd discourse -s /bin/bash -m -U &&\
          --without test --without development &&\
     find /var/www/discourse/vendor/bundle -name tmp -type d -exec rm -rf {} +
 
-
-# For a smaller but less flexible image:
-#RUN apt-get -y autoremove build-essential gcc gcc-4.7 .+-dev
-#RUN echo image size: $(du -hsx /)
diff --git a/image/discourse_test/Dockerfile b/image/discourse_test/Dockerfile
@@ -1,4 +1,4 @@
-FROM discourse/discourse:1.3.1
+FROM discourse/discourse:1.3.2
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 

diff --git a/launcher b/launcher
@@ -60,7 +60,7 @@ git_rec_version='1.8.0'
 config_file=containers/"$config".yml
 cidbootstrap=cids/"$config"_bootstrap.cid
 local_discourse=local_discourse
-image=discourse/discourse:1.3.1
+image=discourse/discourse:1.3.2
 docker_path=`which docker.io || which docker`
 git_path=`which git`