From: Sam <sam.saffron@gmail.com>
Date: Thu, 30 Oct 2014 02:03:59 +0000 (+1100)
Subject: update base image
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6f85e815d09559ddda775edf11882edff6b4d987;p=discourse_docker.git

update base image

- change to NGINX mainline
- update phantomjs to 1.9.8
- update ruby 2.0 to p594
---

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index b22528c..f23751a 100644
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -2,7 +2,7 @@
 # When new LTS ships we can upgrade
 
 # NAME:     discourse_base
-# VERSION:  1.0.5
+# VERSION:  1.0.6
 
 FROM ubuntu:14.04
 
@@ -18,7 +18,7 @@ RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections &&\
     apt-mark hold initscripts &&\
     apt-get -y upgrade &&\
     add-apt-repository -y ppa:rwky/redis &&\
-    add-apt-repository -y ppa:nginx/stable &&\
+    add-apt-repository -y ppa:nginx/development &&\
     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/ trusty-pgdg main" | \
         tee /etc/apt/sources.list.d/postgres.list &&\
@@ -46,11 +46,11 @@ RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections &&\
     apt-get clean &&\
     rm -f /etc/apt/apt.conf.d/40proxy &&\
     locale-gen en_US &&\
-    wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\
-      tar -xjf phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\
-      rm phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\
-      cp phantomjs-1.9.7-linux-x86_64/bin/phantomjs /bin/phantomjs &&\
-      rm -fr phantomjs-1.9.7-linux-x86_64 &&\
+    wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64.tar.bz2 &&\
+      tar -xjf phantomjs-1.9.8-linux-x86_64.tar.bz2 &&\
+      rm phantomjs-1.9.8-linux-x86_64.tar.bz2 &&\
+      cp phantomjs-1.9.8-linux-x86_64/bin/phantomjs /bin/phantomjs &&\
+      rm -fr phantomjs-1.9.8-linux-x86_64 &&\
     wget http://static.jonof.id.au/dl/kenutils/pngout-20130221-linux.tar.gz &&\
       tar -xvf pngout-20130221-linux.tar.gz &&\
       rm pngout-20130221-linux.tar.gz &&\
@@ -60,7 +60,7 @@ RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections &&\
 RUN 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-p576 /usr/local &&\
+    cd / && rm -rf /src/ruby-build && ruby-build 2.0.0-p594 /usr/local &&\
     gem update --system &&\
     gem install bundler &&\
     rm -rf /usr/local/share/ri/2.0.0/system &&\
diff --git a/image/discourse/Dockerfile b/image/discourse/Dockerfile
index b612e5f..9786c52 100644
--- a/image/discourse/Dockerfile
+++ b/image/discourse/Dockerfile
@@ -1,11 +1,11 @@
-# Current version 1.0.5
-FROM samsaffron/discourse_base:1.0.5
+# Current version 1.0.6
+FROM samsaffron/discourse_base:1.0.6
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
 # Discourse specific bits
 RUN useradd discourse -s /bin/bash -m -U &&\
-    mkdir /var/www && cd /var/www &&\
+    mkdir -p /var/www && cd /var/www &&\
      git clone https://github.com/discourse/discourse.git &&\
      cd discourse &&\
       git remote set-branches --add origin tests-passed &&\
diff --git a/launcher b/launcher
index 3bf9f8d..8e70a80 100755
--- a/launcher
+++ b/launcher
@@ -13,7 +13,7 @@ config_file=containers/"$config".yml
 cidfile=cids/"$config".cid
 cidbootstrap=cids/"$config"_boostrap.cid
 local_discourse=local_discourse
-image=samsaffron/discourse:1.0.5
+image=samsaffron/discourse:1.0.6
 docker_path=`which docker.io || which docker`
 
 if [ "${SUPERVISED}" = "true" ]; then