diff --git a/Dockerfile b/Dockerfile index c4d8e67a..fe9b57f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.8-fpm-alpine3.15 +FROM php:8.1.9-fpm-alpine3.16 LABEL maintainer="Ric Harvey " @@ -7,9 +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.21.6 -ENV LUA_MODULE_VERSION 0.10.14 +ENV LUA_MODULE_VERSION 0.10.19 ENV DEVEL_KIT_MODULE_VERSION 0.3.1 -ENV GEOIP2_MODULE_VERSION 3.3 ENV LUAJIT_LIB=/usr/lib ENV LUAJIT_INC=/usr/include/luajit-2.1 @@ -17,7 +16,7 @@ ENV LUAJIT_INC=/usr/include/luajit-2.1 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php RUN apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/community gnu-libiconv -RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ +RUN GPG_KEYS=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62 \ && CONFIG="\ --prefix=/etc/nginx \ --sbin-path=/usr/sbin/nginx \ @@ -65,7 +64,6 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ --with-http_v2_module \ --add-module=/usr/src/ngx_devel_kit-$DEVEL_KIT_MODULE_VERSION \ --add-module=/usr/src/lua-nginx-module-$LUA_MODULE_VERSION \ -# --add-module=/usr/src/ngx_http_geoip2_module-$GEOIP2_MODULE_VERSION \ " \ && addgroup -S nginx \ && adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx \ @@ -91,19 +89,19 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ && curl -fSL https://github.com/simpl/ngx_devel_kit/archive/v$DEVEL_KIT_MODULE_VERSION.tar.gz -o ndk.tar.gz \ && curl -fSL https://github.com/openresty/lua-nginx-module/archive/v$LUA_MODULE_VERSION.tar.gz -o lua.tar.gz \ # && curl -fSL https://github.com/leev/ngx_http_geoip2_module/archive/$GEOIP2_MODULE_VERSION.tar.gz -o ngx_http_geoip2_module.tar.gz \ - && export GNUPGHOME="$(mktemp -d)" \ - && found=''; \ - for server in \ - ha.pool.sks-keyservers.net \ - hkp://keyserver.ubuntu.com:80 \ - hkp://p80.pool.sks-keyservers.net:80 \ - pgp.mit.edu \ - ; do \ - echo "Fetching GPG key $GPG_KEYS from $server"; \ - gpg --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$GPG_KEYS" && found=yes && break; \ - done; \ - test -z "$found" && echo >&2 "error: failed to fetch GPG key $GPG_KEYS" && exit 1; \ - gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \ +# && export GNUPGHOME="$(mktemp -d)" \ +# && found=''; \ +# for server in \ +# ha.pool.sks-keyservers.net \ +# hkp://keyserver.ubuntu.com:80 \ +# hkp://p80.pool.sks-keyservers.net:80 \ +# pgp.mit.edu \ +# ; do \ +# echo "Fetching GPG key $GPG_KEYS from $server"; \ +# gpg --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$GPG_KEYS" && found=yes && break; \ +# done; \ +# test -z "$found" && echo >&2 "error: failed to fetch GPG key $GPG_KEYS" && exit 1; \ +# gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \ #&& rm -r "$GNUPGHOME" nginx.tar.gz.asc \ && mkdir -p /usr/src \ && tar -zxC /usr/src -f nginx.tar.gz \ diff --git a/README.md b/README.md index 754fc8d2..d34a8121 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/2.1.3 | Master Branch |1.22.0 | 8.1.6 | 3.15 | +| latest/2.1.4 | Master Branch |1.21.6 | 8.1.9 | 3.16 | 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 529ba8d0..206bdc64 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -17,6 +17,7 @@ The latest tag will always follow the master branch in git. the other versions w | Docker Tag | PHP Version | Nginx Version | Alpine Version | Container Scripts | Notes | |-----|-------|-----|--------|--------|----------| +| 2.1.4 | 8.1.9 |1.21.6 | 3.16 | 0.3.16 | nginx upgraded to 1.22.0 | | 2.1.3 | 8.1.6 |1.22.0 | 3.15 | 0.3.16 | nginx upgraded to 1.22.0 | | 2.1.2 | 8.1.6 |1.21.6 | 3.15 | 0.3.16 | mod lua upgraded to 0.10.17 | | 2.1.1 | 8.1.5 |1.21.6 | 3.15 | 0.3.16 | mod lua upgraded to 0.10.17 |