-
-
Notifications
You must be signed in to change notification settings - Fork 851
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
18 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM php:8.1.8-fpm-alpine3.15 | ||
FROM php:8.1.9-fpm-alpine3.16 | ||
|
||
LABEL maintainer="Ric Harvey <[email protected]>" | ||
|
||
|
@@ -7,17 +7,16 @@ 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 | ||
|
||
# resolves #166 | ||
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 \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters