diff --git a/Dockerfile b/Dockerfile index e646021..a3c6f8a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.1.6-fpm-alpine +FROM php:7.1.7-fpm-alpine MAINTAINER ngineered @@ -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.13.1 +ENV NGINX_VERSION 1.13.2 RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ && CONFIG="\ diff --git a/README.md b/README.md index 2784ae2..eca0c1b 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.13.1 | 7.1.6 | 3.4 | +| latest | Master Branch |1.13.2 | 7.1.7 | 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 727dfdd..2906835 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -15,7 +15,7 @@ The latest tag will always follow the master branch in git. the other versions w | Docker Tag | GitHub Release | Nginx Version | PHP Version | Alpine Version | Container Scripts | |-----|-------|-----|--------|--------|--------| -| latest | Master Branch |1.11.10 | 7.1.2 | 3.4 | 0.2.6 | +| latest | Master Branch |1.13.2 | 7.1.7 | 3.4 | 0.2.9 | | 1.1.1 | 1.1.1 |1.11.9 | 7.1.1 | 3.4 | 0.2.5 | | 1.1.2 | 1.1.2 |1.11.10 | 7.1.1 | 3.4 | 0.2.6 | | 1.1.3 | 1.1.3 |1.11.10 | 7.1.2 | 3.4 | 0.2.6 | @@ -24,6 +24,7 @@ The latest tag will always follow the master branch in git. the other versions w | 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 | | 1.2.1 | 1.2.1 |1.13.1 | 7.1.6 | 3.4 | 0.2.9 | +| 1.2.2 | 1.2.2 |1.13.2 | 7.1.7 | 3.4 | 0.2.9 | These tags will be created as releases on GitHub and as tags in docker hub.