From eacb2ad1e7259949459da33a4df77a7e2352beb9 Mon Sep 17 00:00:00 2001 From: Ric Harvey Date: Fri, 26 Apr 2019 20:06:00 +0100 Subject: [PATCH] Move to nginx 1.16.0 new stable --- Dockerfile | 2 +- README.md | 2 +- docs/versioning.md | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5381f40..cf52b54 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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.14.2 +ENV NGINX_VERSION 1.16.0 ENV LUA_MODULE_VERSION 0.10.14 ENV DEVEL_KIT_MODULE_VERSION 0.3.0 ENV LUAJIT_LIB=/usr/lib diff --git a/README.md b/README.md index fc8a5d4..cea07b7 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 | Git Release | Nginx Version | PHP Version | Alpine Version | |-----|-------|-----|--------|--------| -| latest/1.6.8 | Master Branch |1.14.2 | 7.3.4 | 3.9 | +| latest/1.7.0 | Master Branch |1.16.0 | 7.3.4 | 3.9 | For other tags please see: [versioning](https://gitlab.com/ric_harvey/nginx-php-fpm/blob/master/docs/versioning.md) diff --git a/docs/versioning.md b/docs/versioning.md index 8ec0ff8..034dce5 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -26,6 +26,7 @@ The latest tag will always follow the master branch in git. the other versions w | 1.6.6 | 7.3.3 |1.14.2 | 3.9 | 0.3.12 || | 1.6.7 | 7.3.3 |1.14.2 | 3.9 | 0.3.13 | Broken | | 1.6.8 | 7.3.4 |1.14.2 | 3.9 | 0.3.12 | Custom scripts rolled back | +| 1.7.0 | 7.3.4 |1.16.0 | 3.9 | 0.3.12 | First move to nginx 1.16.0 | These tags will be created on GitLab and as tags in docker hub.