Merge branch 'release/1.1.0'

Author: mstrazds1

Changelog.md

@@ -1,3 +1,13 @@
+## 1.1.0 (release date: 2017-01-17)
+
+ * Updated nginx conf sendfile default to 'off'
+ * Updated NVM version to 0.33.0
+ * Updated Node.js to version 6.9.4 LTS
+ * Added synchronise on start to the ntp daemon
+ * Added 'www' folder and moved index.php
+ * Added docker-compose.yml for easy setup
+ * Update PECL channel listing
+
 ## 1.0.3 (release date: 2016-11-22)
 
  * Updated newrelic script path

Dockerfile

@@ -12,7 +12,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Nginx-PHP Installation
 RUN apt-get update -y && apt-get install -y 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
+					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/php && add-apt-repository -y ppa:nginx/stable
 RUN apt-get update -y && apt-get upgrade -y && apt-get install -q -y php5.6 php5.6-dev php5.6-fpm php5.6-mysqlnd \
@@ -24,6 +24,9 @@ RUN apt-get update -y && apt-get upgrade -y && apt-get install -q -y php5.6 php5
 # Run update timezone replace city with relevant city. eg. "Australia/Sydney"
 RUN cp -p /usr/share/zoneinfo/Australia/Sydney /etc/localtime
 
+# Update PECL channel listing
+RUN pecl channel-update pecl.php.net
+
 # Add build script
 RUN mkdir -p /root/setup
 ADD build/setup.sh /root/setup/setup.sh
@@ -50,7 +53,7 @@ RUN chmod +x /etc/service/ntp/run
 
 # Set WWW public folder
 RUN mkdir -p /var/www/public
-ADD build/index.php /var/www/public/index.php
+ADD www/index.php /var/www/public/index.php
 
 RUN chown -R www-data:www-data /var/www
 RUN chmod -R 755 /var/www
@@ -70,10 +73,11 @@ 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
+ENV NVM_VERSION 0.33.0
+ENV NODE_VERSION 6.9.4
 
 # Install nvm with node and npm
-RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash \
+RUN curl https://raw.githubusercontent.com/creationix/nvm/v$NVM_VERSION/install.sh | bash \
     && source $NVM_DIR/nvm.sh \
     && nvm install $NODE_VERSION \
     && nvm alias default $NODE_VERSION \

build/nginx.conf

@@ -16,9 +16,12 @@ http {
 
     access_log  /var/log/nginx/access.log;
 
-    sendfile        on;
+    sendfile        off;
     #tcp_nopush     on;
 
+    # set client body size to 32M #
+    client_max_body_size 32M;
+
     #keepalive_timeout  0;
     keepalive_timeout  65;
     tcp_nodelay        on;

build/ntp.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-/usr/sbin/ntpd -u ntp:ntp -p /var/run/ntpd.pid -g -n
+/usr/sbin/ntpd -u ntp:ntp -p /var/run/ntpd.pid -g -n -s

docker-compose.yml

@@ -0,0 +1,16 @@
+# Nginx Baseimage
+
+nginxphp:
+  container_name: nginxphp
+  build: .
+  dockerfile: Dockerfile
+  privileged: true
+  ports:
+    - "80:80"
+    - "443:443"
+    - "2222:22"
+  environment:
+    # Set xterm for terminal for 'docker exec' command colors
+    - TERM=xterm
+  volumes:
+    - ./www:/var/www/public