From b234b92a1e7a89e273ea81cdef6e98395c39ab40 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 27 Nov 2013 18:43:20 -0800
Subject: [PATCH] remove bundler pre ... not working right

---
 image/Dockerfile      | 4 ++--
 image/base/Dockerfile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/image/Dockerfile b/image/Dockerfile
index cc1ce6a..775882d 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -1,7 +1,7 @@
 # DOCKER-VERSION 0.6.7
 
 # 13.10 - 04 has a missing ppa for postgresql 9.2 at the moment (26/10/2013)
-FROM samsaffron/discourse_base
+FROM samsaffron/discourse_base:0.1.1
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
@@ -11,7 +11,7 @@ RUN useradd discourse -s /bin/bash -m -U &&\
      git clone --depth 1 https://github.com/discourse/discourse.git &&\
      chown -R discourse:discourse /var/www/discourse && cd / &&\
     cd /var/www/discourse &&\
-     sudo -u discourse RAILS4=1 bundle install -j4 --deployment \
+     sudo -u discourse RAILS4=1 bundle install --deployment \
          --without test --without development &&\
     cd /var/www/discourse/vendor/bundle &&\
        find . -name tmp -type d | xargs rm -rf && cd /
diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index e9054cd..bd493fd 100644
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -32,7 +32,7 @@ RUN apt-get -y update &&\
     rm -rf /src/ruby-build &&\
     ruby-build 2.0.0-p353 /usr/local &&\
     gem update --system &&\
-    gem install bundler --pre &&\
+    gem install bundler &&\
     cd / && git clone https://github.com/SamSaffron/pups.git &&\
     mkdir /jemalloc && cd /jemalloc &&\
       wget http://www.canonware.com/download/jemalloc/jemalloc-3.4.1.tar.bz2 &&\
-- 
2.25.1