Merge branch 'release/0.9.6'

Author: mstrazds

Changelog.md

@@ -1,3 +1,7 @@
+## 0.9.6 (release date: 2016-01-11)
+
+ * Bugfix moved layers around for node `0.12.10`
+
 ## 0.9.5 (release date: 2016-01-11)
 
  * Updated NVM to switch to node `0.12.10`

Dockerfile

@@ -8,32 +8,17 @@ 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 wget -O - https://download.newrelic.com/548C16BF.gpg | apt-key add - && \
+echo "deb http://apt.newrelic.com/debian/ newrelic non-free" > /etc/apt/sources.list.d/newrelic.list
 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
-RUN apt-get update -y && sudo apt-get upgrade -y && apt-get install -y php5 php5-cli php5-fpm php5-mysqlnd \
+RUN apt-get update -y && sudo apt-get upgrade -y && apt-get install -yq php5 php5-cli php5-fpm php5-mysqlnd \
 					php5-pgsql php5-curl php5-gd php5-mcrypt php5-intl php5-imap php5-tidy \
-					php-pear php5-xmlrpc
+					php-pear php5-xmlrpc newrelic-php5
 
 # Run update timezone replace city with relevant city. eg. "Australia/Sydney"
 RUN cp -p /usr/share/zoneinfo/Australia/Sydney /etc/localtime
 
-# Replace shell with bash so we can source files
-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.12.10
-
-# Install nvm with node and npm
-RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash \
-    && source $NVM_DIR/nvm.sh \
-    && nvm install $NODE_VERSION \
-    && nvm alias default $NODE_VERSION \
-    && nvm use default
-
-ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules
-ENV PATH      $NVM_DIR/v$NODE_VERSION/bin:$PATH
-
 # Install nginx (full)
 RUN apt-get install -y nginx-full
 
@@ -71,15 +56,6 @@ ADD build/index.php /var/www/public/index.php
 RUN chown -R www-data:www-data /var/www
 RUN chmod -R 755 /var/www
 
-# Install New Relic daemon
-RUN apt-get update && \
-    apt-get -yq install wget && \
-    wget -O - https://download.newrelic.com/548C16BF.gpg | apt-key add - && \
-    echo "deb http://apt.newrelic.com/debian/ newrelic non-free" > /etc/apt/sources.list.d/newrelic.list
-
-RUN apt-get update && \
-    apt-get -yq install newrelic-php5
-
 # Add New Relic APM install script
 RUN mkdir -p /etc/my_init.d
 ADD build/newrelic.sh /etc/my_init.d/newrelic.sh
@@ -90,6 +66,23 @@ ENV NR_INSTALL_SILENT 1
 ENV NR_INSTALL_KEY **ChangeMe**
 ENV NR_APP_NAME "Docker PHP Application"
 
+# Replace shell with bash so we can source files
+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.12.10
+
+# Install nvm with node and npm
+RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash \
+    && source $NVM_DIR/nvm.sh \
+    && nvm install $NODE_VERSION \
+    && nvm alias default $NODE_VERSION \
+    && nvm use default
+
+ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules
+ENV PATH      $NVM_DIR/v$NODE_VERSION/bin:$PATH
+
 # Set terminal environment
 ENV TERM=xterm