diff --git a/Dockerfile b/Dockerfile index 20a19ce..e646021 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.1.3-fpm-alpine +FROM php:7.1.6-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.12.0 +ENV NGINX_VERSION 1.13.1 RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ && CONFIG="\ diff --git a/docs/versioning.md b/docs/versioning.md index 1175873..727dfdd 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -23,6 +23,7 @@ The latest tag will always follow the master branch in git. the other versions w | 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 | +| 1.2.1 | 1.2.1 |1.13.1 | 7.1.6 | 3.4 | 0.2.9 | These tags will be created as releases on GitHub and as tags in docker hub.