diff --git a/Dockerfile b/Dockerfile index c0c5b73..807bf82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.3.8-fpm-alpine3.9 +FROM php:7.3.9-fpm-alpine3.10 LABEL maintainer="Ric Harvey " @@ -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.16.0 +ENV NGINX_VERSION 1.16.1 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 5df7214..957095f 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,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.7.4 | Master Branch |1.16.0 | 7.3.8 | 3.9 | +| latest/1.8.0 | Master Branch |1.16.1 | 7.3.9 | 3.10 | 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 722c6a9..10d36b8 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -31,6 +31,7 @@ The latest tag will always follow the master branch in git. the other versions w | 1.7.2 | 7.3.6 |1.16.0 | 3.9 | 0.3.12 | Bump to PHP 7.3.6 | | 1.7.3 | 7.3.6 |1.16.0 | 3.9 | 0.3.12 | Bump xdebug 2.7.2 | | 1.7.4 | 7.3.8 |1.16.0 | 3.9 | 0.3.12 | upgrade php to 7.3.8 | +| 1.8.0 | 7.3.9 |1.16.1 | 3.10 | 0.3.12 | Alpine upgrade to 3.10, PHP 7.3.9 and nginx 1.16.1 upgrades | These tags will be created on GitLab and as tags in docker hub.