From 2bdce9f438c3672408dfa76a50ca38b1c4056661 Mon Sep 17 00:00:00 2001
From: Michael Brown <michael.brown@discourse.org>
Date: Tue, 8 Apr 2014 00:29:24 -0400
Subject: [PATCH] Update base image to 0.2.0

* add -updates repository
* add rsyslog
* use caching proxy during build if present
* much resilient!
---
 image/Dockerfile      |  2 +-
 image/base/Dockerfile | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/image/Dockerfile b/image/Dockerfile
index db78495..7a63c0f 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM samsaffron/discourse_base:0.1.2
+FROM samsaffron/discourse_base:0.2.0
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index 5f501ff..b67dca7 100644
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -2,15 +2,22 @@
 
 # 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 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 upgrade &&\
     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 &&\
     add-apt-repository -y ppa:rwky/redis &&\
     add-apt-repository -y ppa:nginx/stable &&\
     apt-get install -y curl && curl http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | apt-key add - &&\
@@ -25,9 +32,9 @@ RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections &&\
                        postgresql-9.3 postgresql-client-9.3 \
                        postgresql-contrib-9.3 libpq-dev libreadline-dev \
                        nginx language-pack-en sudo cron \
-                       psmisc &&\
+                       psmisc rsyslog &&\
     dpkg-divert --local --rename --add /sbin/initctl &&\
-    ln -s /bin/true /sbin/initctl &&\
+    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' >> /etc/gemrc &&\
     mkdir /src && cd /src && git clone https://github.com/sstephenson/ruby-build.git &&\
@@ -42,4 +49,5 @@ RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections &&\
       mv lib/libjemalloc.so.1 /usr/lib && cd / && rm -rf /jemalloc &&\
     apt-get -y install runit monit socat &&\
     apt-get clean &&\
+    rm -f /etc/apt/apt.conf.d/40proxy &&\
     locale-gen en_US
-- 
2.25.1