From b3aba08426757e1463ae5ac0b45a7a3a29d8c178 Mon Sep 17 00:00:00 2001
From: Jake Moshenko <jake@devtable.com>
Date: Tue, 13 May 2014 18:31:52 -0400
Subject: [PATCH] Upgrade to a trusty based version of phusion baseimage.

---
 Dockerfile | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e5a9d7e07..f4718a99f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,26 +1,20 @@
-FROM phusion/baseimage:0.9.9
+FROM phusion/baseimage:0.9.10
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV HOME /root
 
-# Needed for this fix: http://stackoverflow.com/a/21715730
-RUN apt-get update
-RUN apt-get install -y software-properties-common python-software-properties
-RUN add-apt-repository ppa:chris-lea/node.js
-
 # Install the dependencies.
 RUN apt-get update
 
 # New ubuntu packages should be added as their own apt-get install lines below the existing install commands
-RUN apt-get install -y git python-virtualenv python-dev libjpeg8 libjpeg62-dev libevent-dev gdebi-core g++ libmagic1 libssl1.0.0
+RUN apt-get install -y git python-virtualenv python-dev libjpeg8 libjpeg62-dev libevent-dev gdebi-core g++ libmagic1
 
 # PhantomJS
-RUN apt-get install -y libfreetype6 libfreetype6-dev fontconfig
-ADD https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2 phantomjs.tar.bz2
-RUN tar xjf phantomjs.tar.bz2 && ln -s `pwd`/phantomjs*/bin/phantomjs /usr/bin/phantomjs
+RUN apt-get install -y phantomjs
 
 # Grunt
-RUN apt-get install -y nodejs
+RUN apt-get install -y nodejs npm
+RUN ln -s /usr/bin/nodejs /usr/bin/node
 RUN npm install -g grunt-cli
 
 ADD binary_dependencies binary_dependencies