Merge branch 'release/0.9.1'

Author: mstrazds1

Changelog.md

@@ -1,3 +1,9 @@
+## 0.9.1 (release date: 2015-10-07)
+
+ * Removed stale NTP entries
+ * Updated `phusion/baseimage` to `0.9.17`
+ * Added latest version of nodejs installation `v4.1.2`
+
 ## 0.9.0 (release date: 2015-10-06)
 
  * Initial release

Dockerfile

@@ -1,4 +1,4 @@
-FROM phusion/baseimage:0.9.16
+FROM phusion/baseimage:0.9.17
 
 # Phusion setup
 ENV HOME /root
@@ -9,10 +9,13 @@ CMD ["/sbin/my_init"]
 # Nginx-PHP Installation
 RUN apt-get update -y && apt-get install -y vim curl wget build-essential python-software-properties git-core
 RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 4F4EA0AAE5267A6C
-RUN add-apt-repository -y ppa:ondrej/php5-5.6 && add-apt-repository -y ppa:nginx/stable && add-apt-repository ppa:chris-lea/node.js
+RUN add-apt-repository -y ppa:ondrej/php5-5.6 && add-apt-repository -y ppa:nginx/stable
 RUN apt-get update -y && sudo apt-get upgrade -y && apt-get install -y php5 php5-cli php5-fpm php5-mysqlnd php5-curl \
-					php5-gd php5-mcrypt php5-intl php5-imap php5-tidy php-pear php5-xmlrpc \
-					nodejs
+					php5-gd php5-mcrypt php5-intl php5-imap php5-tidy php-pear php5-xmlrpc
+
+# Install latest version of nodejs
+RUN curl --silent --location https://deb.nodesource.com/setup_4.x | sudo bash -
+RUN apt-get install -y nodejs
 
 # Install nginx (full)
 RUN apt-get install -y nginx-full