From cc2ff250523596611d9f055c9b15d6ca2cb3d427 Mon Sep 17 00:00:00 2001
From: Ric Harvey <ric@ngineered.co.uk>
Date: Sun, 17 Jan 2016 22:35:36 +0000
Subject: [PATCH] Various fixes and updates

---
 Dockerfile |  5 +----
 README.md  | 21 +++++++++------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c068990..808862f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:14.04.2
+FROM ubuntu:14.04.3
 MAINTAINER Ric Harvey <ric@ngineered.co.uk>
 
 # Surpress Upstart errors/warning
@@ -51,10 +51,7 @@ RUN sed -i -e "s/;listen.mode = 0660/listen.mode = 0750/g" /etc/php5/fpm/pool.d/
 find /etc/php5/cli/conf.d/ -name "*.ini" -exec sed -i -re 's/^(\s*)#(.*)/\1;\2/g' {} \;
 
 # mycrypt conf
-RUN ln -s /etc/php5/conf.d/mcrypt.ini /etc/php5/mods-available/mcrypt.ini
 RUN php5enmod mcrypt
-RUN service php5-fpm restart
-RUN service nginx restart
 
 # nginx site conf
 RUN rm -Rf /etc/nginx/conf.d/* && \
diff --git a/README.md b/README.md
index 9b6f887..01889e7 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,14 @@ If you have any improvements please submit a pull request.
 ### Docker hub repository
 The Docker hub build can be found here: [https://registry.hub.docker.com/u/richarvey/nginx-php-fpm/](https://registry.hub.docker.com/u/richarvey/nginx-php-fpm/)
 
-## Nginx Versions
+## Nginx Version
 - Mainline Version: **1.9.9**
-- Stable Version: **1.8.0**
-- *Latest = Mainline Version*
+
+## PHP Version
+- PHP: **5.5.9+dfsg-1ubuntu4.14**
+
+## Ubuntu Version
+- Ubuntu Trusty: **14.04.03**
 
 ## Installation
 Pull the image from the docker index rather than downloading the git repo. This prevents you having to build the image on every docker host.
@@ -18,16 +22,7 @@ Pull the image from the docker index rather than downloading the git repo. This
 ```
 docker pull richarvey/nginx-php-fpm:latest
 ```
-To pull the Stable Version:
 
-```
-docker pull richarvey/nginx-php-fpm:stable
-```
-To pull the Mainline Version:
-
-```
-docker pull richarvey/nginx-php-fpm:mainline
-```
 ## Running
 To simply run the container:
 
@@ -151,10 +146,12 @@ database_pass = $$_MYSQL_PASS_$$
 ```
 ### Skip Templating
 In order to speed up install time if templating is not required and you have a lot of files in your web root that you don't wish to be scanned, simply include the flag below:
+
 ```-e TEMPLATE_NGINX_HTML=0```
 
 ### Display Errors
 If you want to display PHP errors on screen for debugging use this feature:
+
 ```-e ERRORS=1```
 
 ### Template anything