From 34e3c96166821176e0ffdad03114460d323fe9eb Mon Sep 17 00:00:00 2001
From: Ric Harvey <ric@ngd.io>
Date: Tue, 18 Apr 2017 09:57:56 +0100
Subject: [PATCH] Update nginx version to 10.12.0

---
 Dockerfile         | 4 ++--
 README.md          | 2 +-
 docs/versioning.md | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2c03ae7..20a19ce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1.2-fpm-alpine
+FROM php:7.1.3-fpm-alpine
 
 MAINTAINER ngineered <support@ngineered.co.uk>
 
@@ -6,7 +6,7 @@ ENV php_conf /usr/local/etc/php-fpm.conf
 ENV fpm_conf /usr/local/etc/php-fpm.d/www.conf
 ENV php_vars /usr/local/etc/php/conf.d/docker-vars.ini
 
-ENV NGINX_VERSION 1.11.10
+ENV NGINX_VERSION 1.12.0
 
 RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
   && CONFIG="\
diff --git a/README.md b/README.md
index 0634995..0639c85 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ If you have improvements or suggestions please open an issue or pull request on
 ### Versioning
 | Docker Tag | GitHub Release | Nginx Version | PHP Version | Alpine Version |
 |-----|-------|-----|--------|--------|
-| latest | Master Branch |1.11.10 | 7.1.2 | 3.4 |
+| latest | Master Branch |1.12.0 | 7.1.3 | 3.4 |
 
 For other tags please see: [versioning](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/versioning.md)
 
diff --git a/docs/versioning.md b/docs/versioning.md
index ec7d107..1175873 100644
--- a/docs/versioning.md
+++ b/docs/versioning.md
@@ -22,6 +22,7 @@ The latest tag will always follow the master branch in git. the other versions w
 | 1.1.4 | 1.1.4 |1.11.10 | 7.1.2 | 3.4 |  0.2.6 |
 | 1.1.5 | 1.1.5 |1.11.10 | 7.1.2 | 3.4 |  0.2.7 |
 | 1.1.6 | 1.1.6 |1.11.10 | 7.1.2 | 3.4 |  0.2.8 |
+| 1.2.0 | 1.2.0 |1.12.10 | 7.1.3 | 3.4 |  0.2.9 |
 
 These tags will be created as releases on GitHub and as tags in docker hub.