Merge branch 'release/1.0.0'

Author: mstrazds1

Dockerfile

@@ -1,30 +1,29 @@
-FROM phusion/baseimage:0.9.18
+FROM phusion/baseimage:0.9.19
 
 # Phusion setup
 ENV HOME /root
 RUN /etc/my_init.d/00_regen_ssh_host_keys.sh
 
 CMD ["/sbin/my_init"]
 
+# Set terminal to non-interactive
+ENV DEBIAN_FRONTEND=noninteractive
+
 # Nginx-PHP Installation
-RUN apt-get update -y && apt-get install -y vim curl wget build-essential python-software-properties git-core
+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
 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 -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 newrelic-php5
+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 \
+					php5.6-pgsql php5.6-curl php5.6-gd php5.6-mbstring php5.6-mcrypt php5.6-intl php5.6-imap php5.6-tidy \
+					php5.6-xml php5.6-xmlrpc newrelic-php5 php-pear nginx-full ntp
+
+                    # php5.6-imagick ffmpeg imagemagick
 
 # Run update timezone replace city with relevant city. eg. "Australia/Sydney"
 RUN cp -p /usr/share/zoneinfo/Australia/Sydney /etc/localtime
 
-# Install nginx (full)
-RUN apt-get install -y nginx-full
-
-# Install ntpd
-RUN apt-get install -y ntp
-
 # Add build script
 RUN mkdir -p /root/setup
 ADD build/setup.sh /root/setup/setup.sh
@@ -34,8 +33,8 @@ RUN (cd /root/setup/; /root/setup/setup.sh)
 # Copy files from repo
 ADD build/default /etc/nginx/sites-available/default
 ADD build/nginx.conf /etc/nginx/nginx.conf
-ADD build/php-fpm.conf /etc/php5/fpm/php-fpm.conf
-ADD build/www.conf /etc/php5/fpm/pool.d/www.conf
+ADD build/php-fpm.conf /etc/php/5.6/fpm/php-fpm.conf
+ADD build/www.conf /etc/php/5.6/fpm/pool.d/www.conf
 ADD build/.bashrc /root/.bashrc
 
 # Add startup scripts for services

README.md

@@ -4,7 +4,7 @@
   </a>
 </p>
 -----
-# nginx-php56 [![](https://badge.imagelayers.io/mstrazds/nginx-php56:latest.svg)](https://imagelayers.io/?images=mstrazds/nginx-php56:latest 'Get your own badge on imagelayers.io')
+# nginx-php56
 A Nginx + PHP 5.6 (FPM) base container. Builds upon on the excellent [phusion/baseimage-docker](https://github.com/phusion/baseimage-docker) container. You can find the docker automated build [here](https://registry.hub.docker.com/u/mstrazds/nginx-php56/).
 
 ### Services

build/default

@@ -28,7 +28,7 @@ server {
     location ~ \.php$ {
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
         # With php5-fpm:
-        fastcgi_pass unix:/var/run/php5-fpm.sock;
+        fastcgi_pass unix:/var/run/php5.6-fpm.sock;
         fastcgi_index index.php;
         include fastcgi_params;
         #fastcgi_param REMOTE_ADDR $http_x_real_ip;

build/php-fpm.conf

@@ -126,4 +126,4 @@ daemonize = no
 
 ; To configure the pools it is recommended to have one .conf file per
 ; pool in the following directory:
-include=/etc/php5/fpm/pool.d/*.conf
+include=/etc/php/5.6/fpm/pool.d/*.conf

build/phpfpm.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-php5-fpm -c /etc/php5/fpm
+php-fpm5.6 -c /etc/php/5.6/fpm

build/setup.sh

@@ -11,22 +11,22 @@ openssl req -nodes -x509 -newkey rsa:4096 -keyout /etc/nginx/certs.d/localhost.k
 ##-------------------------------------------------------
 
 # Set timezone to UTC
-sed -i "s/;date.timezone =.*/date.timezone = UTC/" /etc/php5/fpm/php.ini
-sed -i "s/;date.timezone =.*/date.timezone = UTC/" /etc/php5/cli/php.ini
+sed -i "s/;date.timezone =.*/date.timezone = UTC/" /etc/php/5.6/fpm/php.ini
+sed -i "s/;date.timezone =.*/date.timezone = UTC/" /etc/php/5.6/fpm/php.ini
 
 # Setup php-fpm to not run as daemon (allow my_init to control)
-sed -i -e "s/;daemonize\s*=\s*yes/daemonize = no/g" /etc/php5/fpm/php-fpm.conf
-sed -i "s/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/" /etc/php5/fpm/php.ini
+sed -i -e "s/;daemonize\s*=\s*yes/daemonize = no/g" /etc/php/5.6/fpm/php-fpm.conf
+sed -i "s/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/" /etc/php/5.6/fpm/php.ini
 
 # Setup permissions for php5-fpm
-sed -i '/^;listen.mode = .*/alisten.mode = 0660' /etc/php5/fpm/pool.d/www.conf
-sed -i '/^listen.mode = .*/alisten.owner = www-data' /etc/php5/fpm/pool.d/www.conf
-sed -i '/^listen.mode = .*/alisten.group = www-data' /etc/php5/fpm/pool.d/www.conf
+sed -i '/^;listen.mode = .*/alisten.mode = 0660' /etc/php/5.6/fpm/pool.d/www.conf
+sed -i '/^listen.mode = .*/alisten.owner = www-data' /etc/php/5.6/fpm/pool.d/www.conf
+sed -i '/^listen.mode = .*/alisten.group = www-data' /etc/php/5.6/fpm/pool.d/www.conf
 
 ##-------------------------------------------------------
 # UPDATE FILES AND FOLDERS
 ##-------------------------------------------------------
 
 # Add required php5-fpm folders
-mkdir -p /var/run/php5-fpm && chown -R www-data:www-data /var/run/php5-fpm
-mkdir -p /var/log/php5-fpm && chown -R www-data:www-data /var/log/php5-fpm
+mkdir -p /var/run/php5.6-fpm && chown -R www-data:www-data /var/run/php5.6-fpm
+mkdir -p /var/log/php5.6-fpm && chown -R www-data:www-data /var/log/php5.6-fpm

build/www.conf

@@ -35,7 +35,7 @@ group = www-data
 ;                            (IPv6 and IPv4-mapped) on a specific port;
 ;   '/path/to/unix/socket' - to listen on a unix socket.
 ; Note: This value is mandatory.
-listen = /var/run/php5-fpm.sock
+listen = /var/run/php5.6-fpm.sock
 
 ; Set listen(2) backlog.
 ; Default Value: 65535 (-1 on FreeBSD and OpenBSD)