From e1903539f8efd9ac7fba7128613e6e0c7706b3f3 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Sun, 24 Nov 2013 15:39:35 -0800
Subject: [PATCH] created samsaffron/discourse_base and pushed to docker

---
 image/Dockerfile      | 41 +++--------------------------------------
 image/base/Dockerfile | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 38 deletions(-)
 create mode 100644 image/base/Dockerfile

diff --git a/image/Dockerfile b/image/Dockerfile
index 9f53098..cc1ce6a 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -1,46 +1,10 @@
-# DOCKER-VERSION 0.6.4
+# DOCKER-VERSION 0.6.7
 
 # 13.10 - 04 has a missing ppa for postgresql 9.2 at the moment (26/10/2013)
-FROM ubuntu:12.10
+FROM samsaffron/discourse_base
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
-RUN apt-get -y update &&\
-    apt-get -y upgrade &&\
-    apt-get -y install software-properties-common &&\
-    add-apt-repository -y ppa:rwky/redis &&\
-    add-apt-repository -y ppa:nginx/stable &&\
-    add-apt-repository -y ppa:pitti/postgresql &&\
-    add-apt-repository ppa:chris-lea/node.js &&\
-    apt-get -y update &&\
-    apt-get install -y build-essential git curl libxml2-dev \
-                    libxslt-dev libcurl4-openssl-dev \
-                    libssl-dev libyaml-dev libtool \
-                    libxslt-dev libxml2-dev gawk curl \
-                    pngcrush imagemagick \
-                    postgresql-9.2 postgresql-client-9.2 \
-                    postgresql-contrib-9.2 libpq-dev libreadline-dev \
-                    nginx wget language-pack-en sudo cron \
-                    psmisc &&\
-    dpkg-divert --local --rename --add /sbin/initctl &&\
-    ln -s /bin/true /sbin/initctl &&\
-    apt-get install -y redis-server haproxy openssh-server &&\
-    echo 'gem: --no-document' >> /etc/gemrc &&\
-    mkdir /src && cd /src &&\
-     git clone https://github.com/sstephenson/ruby-build.git && cd / &&\
-    cd /src/ruby-build &&\
-     ./install.sh && cd / &&\
-    rm -rf /src/ruby-build &&\
-    ruby-build 2.0.0-p247 /usr/local &&\
-    gem update --system &&\
-    gem install bundler --pre &&\
-    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 &&\
-      tar -xvjf jemalloc-3.4.1.tar.bz2 && cd jemalloc-3.4.1 && ./configure && make &&\
-      mv lib/libjemalloc.so.1 /usr/lib && cd / && rm -rf /jemalloc &&\
-    apt-get install -y runit && apt-get clean && locale-gen en_US
-
 # Discourse specific bits
 RUN useradd discourse -s /bin/bash -m -U &&\
     mkdir /var/www && cd /var/www &&\
@@ -65,3 +29,4 @@ RUN useradd discourse -s /bin/bash -m -U &&\
 # cd /src &&  git clone https://github.com/coreos/etcd.git &&\
 # cd /src/etcd && ./build &&\
 # cp /src/etcd/etcd /usr/local/bin &&\
+# add-apt-repository ppa:chris-lea/node.js &&\
diff --git a/image/base/Dockerfile b/image/base/Dockerfile
new file mode 100644
index 0000000..e9054cd
--- /dev/null
+++ b/image/base/Dockerfile
@@ -0,0 +1,41 @@
+# DOCKER-VERSION 0.6.7 : samsaffron/discourse_base
+
+# 13.10 - 04 has a missing ppa for postgresql 9.2 at the moment (26/10/2013)
+FROM ubuntu:12.10
+
+MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
+
+RUN apt-get -y update &&\
+    apt-get -y upgrade &&\
+    apt-get -y install software-properties-common &&\
+    add-apt-repository -y ppa:rwky/redis &&\
+    add-apt-repository -y ppa:nginx/stable &&\
+    add-apt-repository -y ppa:pitti/postgresql &&\
+    apt-get -y update &&\
+    apt-get install -y build-essential git curl libxml2-dev \
+                    libxslt-dev libcurl4-openssl-dev \
+                    libssl-dev libyaml-dev libtool \
+                    libxslt-dev libxml2-dev gawk curl \
+                    pngcrush imagemagick \
+                    postgresql-9.2 postgresql-client-9.2 \
+                    postgresql-contrib-9.2 libpq-dev libreadline-dev \
+                    nginx wget language-pack-en sudo cron \
+                    psmisc &&\
+    dpkg-divert --local --rename --add /sbin/initctl &&\
+    ln -s /bin/true /sbin/initctl &&\
+    apt-get install -y redis-server haproxy openssh-server &&\
+    echo 'gem: --no-document' >> /etc/gemrc &&\
+    mkdir /src && cd /src &&\
+     git clone https://github.com/sstephenson/ruby-build.git && cd / &&\
+    cd /src/ruby-build &&\
+     ./install.sh && cd / &&\
+    rm -rf /src/ruby-build &&\
+    ruby-build 2.0.0-p353 /usr/local &&\
+    gem update --system &&\
+    gem install bundler --pre &&\
+    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 &&\
+      tar -xvjf jemalloc-3.4.1.tar.bz2 && cd jemalloc-3.4.1 && ./configure && make &&\
+      mv lib/libjemalloc.so.1 /usr/lib && cd / && rm -rf /jemalloc &&\
+    apt-get install -y runit monit && apt-get clean && locale-gen en_US
-- 
2.25.1