X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=image%2Fbase%2FDockerfile;h=f7d1dedd30674a7fdc79025113ad43e0c5d1b9c4;hb=abd346c71efe5fd4e68bbb67a6315b6ed007710b;hp=bd493fde975b2e042396dbcfa3661213be39ec05;hpb=b234b92a1e7a89e273ea81cdef6e98395c39ab40;p=discourse_docker.git

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index bd493fd..f7d1ded 100644
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -1,36 +1,45 @@
 # 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
+# Official repo only has a ppa for postgresql 9.3 at the moment (14/3/2014)
+# When new LTS ships we can upgrade
+
+# VERSION 0.2.0
+FROM ubuntu:12.04
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
-RUN apt-get -y update &&\
+RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections &&\
+    apt-get -y install fping &&\
+    sh -c "fping proxy && echo 'Acquire { Retries \"0\"; HTTP { Proxy \"http://proxy:3128\";}; };' > /etc/apt/apt.conf.d/40proxy || true" &&\
+    apt-get -y update &&\
+    apt-get -y install python-software-properties &&\
+    add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe" &&\
+    add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc)-updates main universe" &&\
+    apt-get -y update &&\
+    apt-mark hold initscripts &&\
     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 install -y curl && curl http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | apt-key add - &&\
+    echo "deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main" | \
+    tee /etc/apt/sources.list.d/postgres.list &&\
     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 &&\
+    apt-get -y install build-essential git curl wget \
+                       libxslt-dev libcurl4-openssl-dev \
+                       libssl-dev libyaml-dev libtool \
+                       libxml2-dev gawk \
+                       pngcrush imagemagick \
+                       postgresql-9.3 postgresql-client-9.3 \
+                       postgresql-contrib-9.3 libpq-dev libreadline-dev \
+                       nginx language-pack-en sudo cron \
+                       psmisc rsyslog &&\
     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 &&\
+    sh -c "test -f /sbin/initctl || ln -s /bin/true /sbin/initctl" &&\
+    apt-get -y install redis-server haproxy openssh-server &&\
+    echo 'gem: --no-document' >> /usr/local/etc/gemrc &&\
+    mkdir /src && cd /src && git clone https://github.com/sstephenson/ruby-build.git &&\
+    cd /src/ruby-build && ./install.sh &&\
+    cd / && rm -rf /src/ruby-build && ruby-build 2.0.0-p451 /usr/local &&\
     gem update --system &&\
     gem install bundler &&\
     cd / && git clone https://github.com/SamSaffron/pups.git &&\
@@ -38,4 +47,7 @@ RUN apt-get -y update &&\
       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
+    apt-get -y install runit monit socat &&\
+    apt-get clean &&\
+    rm -f /etc/apt/apt.conf.d/40proxy &&\
+    locale-gen en_US