diff --git a/Dockerfile b/Dockerfile index 3f952dd..e560727 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.9-fpm-alpine +FROM php:7.4.10-fpm-alpine LABEL maintainer="Ric Harvey " @@ -7,8 +7,8 @@ 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.18.0 -ENV LUA_MODULE_VERSION 0.10.14 -ENV DEVEL_KIT_MODULE_VERSION 0.3.0 +ENV LUA_MODULE_VERSION 0.10.17 +ENV DEVEL_KIT_MODULE_VERSION 0.3.1 ENV GEOIP2_MODULE_VERSION 3.2 ENV LUAJIT_LIB=/usr/lib ENV LUAJIT_INC=/usr/include/luajit-2.1 diff --git a/README.md b/README.md index c923922..b088dea 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.10.3 | Master Branch |1.18.0 | 7.4.9 | 3.12 | +| latest/1.10.4 | Master Branch |1.18.0 | 7.4.10 | 3.12 | _Note:_ The image is now aviable on x86_64 and Arm systems! diff --git a/docs/versioning.md b/docs/versioning.md index 18de4fe..1ec2060 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.10.1 | 7.4.9 |1.18.0 | 3.12 | 0.3.13 | bump to PHP 7.4.9 | | 1.10.2 | 7.4.9 |1.18.0 | 3.12 | 0.3.13 | Swap Docker file from ADD to COPY | | 1.10.3 | 7.4.9 |1.18.0 | 3.12 | 0.3.14 | run composer as non root user | +| 1.10.4 | 7.4.10 |1.18.0 | 3.12 | 0.3.14 | PHP 7.4.10, devel_kit and mod lua updated | These tags will be created on GitLab and as tags in docker hub. diff --git a/version b/version index 587c5f0..18b3114 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.10.3 +1.10.4