From b404fee43ef7bd928ae28fd0fd3338a6ee6a3993 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 14 Mar 2014 10:42:23 +1100 Subject: [PATCH] base image upgrade pg 9.3 / ruby 451 --- image/Dockerfile | 5 +---- image/base/Dockerfile | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/image/Dockerfile b/image/Dockerfile index 39fdaf7..db78495 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -1,7 +1,4 @@ -# 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:0.1.1 +FROM samsaffron/discourse_base:0.1.2 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" diff --git a/image/base/Dockerfile b/image/base/Dockerfile index 006220f..5f501ff 100644 --- a/image/base/Dockerfile +++ b/image/base/Dockerfile @@ -1,26 +1,29 @@ # 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 +FROM ubuntu:12.04 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections &&\ apt-get -y update &&\ apt-get -y upgrade &&\ - apt-get -y install software-properties-common &&\ - apt-add-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe" &&\ + apt-get -y install python-software-properties &&\ + add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe" &&\ 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 -y install build-essential git curl wget \ libxslt-dev libcurl4-openssl-dev \ libssl-dev libyaml-dev libtool \ libxml2-dev gawk \ pngcrush imagemagick \ - postgresql-9.2 postgresql-client-9.2 \ - postgresql-contrib-9.2 libpq-dev libreadline-dev \ + postgresql-9.3 postgresql-client-9.3 \ + postgresql-contrib-9.3 libpq-dev libreadline-dev \ nginx language-pack-en sudo cron \ psmisc &&\ dpkg-divert --local --rename --add /sbin/initctl &&\ @@ -29,7 +32,7 @@ RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections &&\ echo 'gem: --no-document' >> /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-p353 /usr/local &&\ + 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 &&\ -- 2.25.1