Merge branch 'release/0.9.5'

Author: mstrazds

Changelog.md

@@ -1,3 +1,7 @@
+## 0.9.5 (release date: 2016-01-11)
+
+ * Updated NVM to switch to node `0.12.10`
+
 ## 0.9.4 (release date: 2016-01-11)
 
  * Bugfix for removing multiple newrelic instances

Dockerfile

@@ -22,7 +22,7 @@ RUN rm /bin/sh && ln -s /bin/bash /bin/sh
 
 # Install Node Version Manager and install node specific version
 ENV NVM_DIR /usr/local/nvm
-ENV NODE_VERSION 0.10.37
+ENV NODE_VERSION 0.12.10
 
 # Install nvm with node and npm
 RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash \

README.md

@@ -40,7 +40,7 @@ The image generates a self-signed certificate for each container within the fold
 During build the ``build/default`` file is used to copy and configure nginx default settings. This includes a cipher suite for legacy browser (IE8+) support. See: [https://cipherli.st/](https://cipherli.st/)
 
 ### Node + NVM
-The image contains installation and configuration of node ``0.10.37`` by default using NVM [(Node Version Manager)](https://github.com/creationix/nvm). This can be changed by running: ``nvm install $NODE_VERSION`` and using the new node version by running the following command: ``nvm use $NODE_VERSION``
+The image contains installation and configuration of node ``0.12.10`` by default using NVM [(Node Version Manager)](https://github.com/creationix/nvm). This can be changed by running: ``nvm install $NODE_VERSION`` and using the new node version by running the following command: ``nvm use $NODE_VERSION``
 
 ### New Relic APM
 Installs New Relic APM daemon on [container startup](https://github.com/phusion/baseimage-docker#running_startup_scripts) to monitor the php application within the image. See [this tutorial](http://code.tutsplus.com/tutorials/how-to-monitor-docker-based-applications-using-new-relic--cms-24891) for more information.