diff --git a/Dockerfile b/Dockerfile index c13da24..6f2fa16 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2.0-fpm-alpine +FROM php:7.2.4-fpm-alpine LABEL maintainer="Ric Harvey " @@ -6,8 +6,8 @@ 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.7 -ENV LUA_MODULE_VERSION 0.10.11 +ENV NGINX_VERSION 1.14.0 +ENV LUA_MODULE_VERSION 0.10.13 ENV DEVEL_KIT_MODULE_VERSION 0.3.0 ENV LUAJIT_LIB=/usr/lib ENV LUAJIT_INC=/usr/include/luajit-2.1 diff --git a/README.md b/README.md index f92a0ec..190c201 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ 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.7 | 7.1.12 | 3.4 | -| 1.4.1 | 7.2 Branch |1.13.7 | 7.2.0 | 3.6 | +| latest | Master Branch |1.14.0 | 7.2.4 | 3.6 | +| 1.5.0 | 7.2 Branch |1.14.0 | 7.2.4 | 3.6 | For other tags please see: [versioning](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/versioning.md) diff --git a/docs/versioning.md b/docs/versioning.md index 5e23213..37d6ecf 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -49,6 +49,7 @@ The latest tag will always follow the master branch in git. the other versions w |-----|-------|-----|--------|--------|--------| | 1.4.0 | 7.2.0 |1.13.2 | 7.2.0 | 3.6 | 0.3.5 | | 1.4.1 | 7.2.0 |1.13.2 | 7.2.0 | 3.6 | 0.3.6 | +| 1.5.0 | 7.2.4 |1.14.0 | 7.2.4 | 3.6 | 0.3.6 | These tags will be created as releases on GitHub and as tags in docker hub.