Skip to content

Commit ef868e6

Browse files
committed
PHP version bump to 8.1.9
1 parent 0683e9e commit ef868e6

File tree

3 files changed

+18
-19
lines changed

3 files changed

+18
-19
lines changed

Dockerfile

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.1.8-fpm-alpine3.15
1+
FROM php:8.1.9-fpm-alpine3.16
22

33
LABEL maintainer="Ric Harvey <ric@squarecows.com>"
44

@@ -7,17 +7,16 @@ ENV fpm_conf /usr/local/etc/php-fpm.d/www.conf
77
ENV php_vars /usr/local/etc/php/conf.d/docker-vars.ini
88

99
ENV NGINX_VERSION 1.21.6
10-
ENV LUA_MODULE_VERSION 0.10.14
10+
ENV LUA_MODULE_VERSION 0.10.19
1111
ENV DEVEL_KIT_MODULE_VERSION 0.3.1
12-
ENV GEOIP2_MODULE_VERSION 3.3
1312
ENV LUAJIT_LIB=/usr/lib
1413
ENV LUAJIT_INC=/usr/include/luajit-2.1
1514

1615
# resolves #166
1716
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php
1817
RUN apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/community gnu-libiconv
1918

20-
RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
19+
RUN GPG_KEYS=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62 \
2120
&& CONFIG="\
2221
--prefix=/etc/nginx \
2322
--sbin-path=/usr/sbin/nginx \
@@ -65,7 +64,6 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
6564
--with-http_v2_module \
6665
--add-module=/usr/src/ngx_devel_kit-$DEVEL_KIT_MODULE_VERSION \
6766
--add-module=/usr/src/lua-nginx-module-$LUA_MODULE_VERSION \
68-
# --add-module=/usr/src/ngx_http_geoip2_module-$GEOIP2_MODULE_VERSION \
6967
" \
7068
&& addgroup -S nginx \
7169
&& adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx \
@@ -91,19 +89,19 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
9189
&& curl -fSL https://github.com/simpl/ngx_devel_kit/archive/v$DEVEL_KIT_MODULE_VERSION.tar.gz -o ndk.tar.gz \
9290
&& curl -fSL https://github.com/openresty/lua-nginx-module/archive/v$LUA_MODULE_VERSION.tar.gz -o lua.tar.gz \
9391
# && curl -fSL https://github.com/leev/ngx_http_geoip2_module/archive/$GEOIP2_MODULE_VERSION.tar.gz -o ngx_http_geoip2_module.tar.gz \
94-
&& export GNUPGHOME="$(mktemp -d)" \
95-
&& found=''; \
96-
for server in \
97-
ha.pool.sks-keyservers.net \
98-
hkp://keyserver.ubuntu.com:80 \
99-
hkp://p80.pool.sks-keyservers.net:80 \
100-
pgp.mit.edu \
101-
; do \
102-
echo "Fetching GPG key $GPG_KEYS from $server"; \
103-
gpg --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$GPG_KEYS" && found=yes && break; \
104-
done; \
105-
test -z "$found" && echo >&2 "error: failed to fetch GPG key $GPG_KEYS" && exit 1; \
106-
gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
92+
# && export GNUPGHOME="$(mktemp -d)" \
93+
# && found=''; \
94+
# for server in \
95+
# ha.pool.sks-keyservers.net \
96+
# hkp://keyserver.ubuntu.com:80 \
97+
# hkp://p80.pool.sks-keyservers.net:80 \
98+
# pgp.mit.edu \
99+
# ; do \
100+
# echo "Fetching GPG key $GPG_KEYS from $server"; \
101+
# gpg --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$GPG_KEYS" && found=yes && break; \
102+
# done; \
103+
# test -z "$found" && echo >&2 "error: failed to fetch GPG key $GPG_KEYS" && exit 1; \
104+
# gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
107105
#&& rm -r "$GNUPGHOME" nginx.tar.gz.asc \
108106
&& mkdir -p /usr/src \
109107
&& tar -zxC /usr/src -f nginx.tar.gz \

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ If you have improvements or suggestions please open an issue or pull request on
1010
### Versioning
1111
| Docker Tag | Git Release | Nginx Version | PHP Version | Alpine Version |
1212
|-----|-------|-----|--------|--------|
13-
| latest/2.1.3 | Master Branch |1.22.0 | 8.1.6 | 3.15 |
13+
| latest/2.1.4 | Master Branch |1.21.6 | 8.1.9 | 3.16 |
1414

1515
For other tags please see: [versioning](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/versioning.md)
1616

docs/versioning.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ The latest tag will always follow the master branch in git. the other versions w
1717

1818
| Docker Tag | PHP Version | Nginx Version | Alpine Version | Container Scripts | Notes |
1919
|-----|-------|-----|--------|--------|----------|
20+
| 2.1.4 | 8.1.9 |1.21.6 | 3.16 | 0.3.16 | nginx upgraded to 1.22.0 |
2021
| 2.1.3 | 8.1.6 |1.22.0 | 3.15 | 0.3.16 | nginx upgraded to 1.22.0 |
2122
| 2.1.2 | 8.1.6 |1.21.6 | 3.15 | 0.3.16 | mod lua upgraded to 0.10.17 |
2223
| 2.1.1 | 8.1.5 |1.21.6 | 3.15 | 0.3.16 | mod lua upgraded to 0.10.17 |

0 commit comments

Comments
 (0)