Skip to content

Commit d85a9e6

Browse files
alessfgalessfg
committed
Update mainline NGINX to 1.27.1
* And update stable NGINX to 1.26.2 * Update NJS to 0.8.5 * Introduce specific ENV variables for dynamic module versions * Strip trailing whitespace from local resolvers script
1 parent ec67ff4 commit d85a9e6

File tree

20 files changed

+128
-76
lines changed

20 files changed

+128
-76
lines changed

‎Dockerfile-alpine-perl.template‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ RUN set -x \
3636
bash \
3737
alpine-sdk \
3838
findutils \
39+
curl \
3940
&& su nobody -s /bin/sh -c " \
4041
export HOME=${tempDir} \
4142
&& cd ${tempDir} \

‎Dockerfile-alpine-slim.template‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
55

66
ENV NGINX_VERSION=%%NGINX_VERSION%%
77
ENV PKG_RELEASE=%%PKG_RELEASE%%
8+
ENV DYNPKG_RELEASE=%%DYNPKG_RELEASE%%
89

910
ARG UID=101
1011
ARG GID=101
@@ -51,6 +52,7 @@ RUN set -x \
5152
bash \
5253
alpine-sdk \
5354
findutils \
55+
curl \
5456
&& su nobody -s /bin/sh -c " \
5557
export HOME=${tempDir} \
5658
&& cd ${tempDir} \

‎Dockerfile-alpine.template‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ RUN set -x \
4242
bash \
4343
alpine-sdk \
4444
findutils \
45+
curl \
4546
&& su nobody -s /bin/sh -c " \
4647
export HOME=${tempDir} \
4748
&& cd ${tempDir} \

‎Dockerfile-debian.template‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ENV NGINX_VERSION=%%NGINX_VERSION%%
77
ENV NJS_VERSION=%%NJS_VERSION%%
88
ENV NJS_RELEASE=%%NJS_RELEASE%%
99
ENV PKG_RELEASE=%%PKG_RELEASE%%
10+
ENV DYNPKG_RELEASE=%%DYNPKG_RELEASE%%
1011

1112
ARG UID=101
1213
ARG GID=101

‎entrypoint/15-local-resolvers.envsh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
99
[ "${NGINX_ENTRYPOINT_LOCAL_RESOLVERS:-}" ] || return 0
1010

1111
NGINX_LOCAL_RESOLVERS=$(awk 'BEGIN{ORS=" "} $1=="nameserver" {if ($2 ~ ":") {print "["$2"]"} else {print $2}}' /etc/resolv.conf)
12+
13+
NGINX_LOCAL_RESOLVERS="${NGINX_LOCAL_RESOLVERS% }"
14+
1215
export NGINX_LOCAL_RESOLVERS

‎mainline/alpine-perl/Dockerfile‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=nginxinc/nginx-unprivileged:1.27.0-alpine
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.27.1-alpine
77
FROM $IMAGE
88

99
ARG UID=101
@@ -15,10 +15,10 @@ RUN set -x \
1515
&& apkArch="$(cat /etc/apk/arch)" \
1616
&& nginxPackages=" \
1717
nginx=${NGINX_VERSION}-r${PKG_RELEASE} \
18-
nginx-module-xslt=${NGINX_VERSION}-r${PKG_RELEASE} \
19-
nginx-module-geoip=${NGINX_VERSION}-r${PKG_RELEASE} \
20-
nginx-module-image-filter=${NGINX_VERSION}-r${PKG_RELEASE} \
21-
nginx-module-perl=${NGINX_VERSION}-r${PKG_RELEASE} \
18+
nginx-module-xslt=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
19+
nginx-module-geoip=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
20+
nginx-module-image-filter=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
21+
nginx-module-perl=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
2222
nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-r${NJS_RELEASE} \
2323
" \
2424
# install prerequisites for public key and pkg-oss checks
@@ -47,11 +47,12 @@ RUN set -x \
4747
bash \
4848
alpine-sdk \
4949
findutils \
50+
curl \
5051
&& su nobody -s /bin/sh -c " \
5152
export HOME=${tempDir} \
5253
&& cd ${tempDir} \
5354
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
54-
&& PKGOSSCHECKSUM=\"cd3333f4dfa4a873f6df73dfe24e047adc092d779aefb46577b6307ff0d0125543508694a80158b2bfc891167ad763b0d08287829df9924d4c22f50d063e76c0 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
55+
&& PKGOSSCHECKSUM=\"b9fbdf1779186fc02aa59dd87597fe4e906892391614289a4e6eedba398a3e770347b5b07110cca8c11fa3ba85bb711626ae69832e74c69ca8340d040a465907 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
5556
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5657
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5758
else \

‎mainline/alpine-slim/15-local-resolvers.envsh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
99
[ "${NGINX_ENTRYPOINT_LOCAL_RESOLVERS:-}" ] || return 0
1010

1111
NGINX_LOCAL_RESOLVERS=$(awk 'BEGIN{ORS=" "} $1=="nameserver" {if ($2 ~ ":") {print "["$2"]"} else {print $2}}' /etc/resolv.conf)
12+
13+
NGINX_LOCAL_RESOLVERS="${NGINX_LOCAL_RESOLVERS% }"
14+
1215
export NGINX_LOCAL_RESOLVERS

‎mainline/alpine-slim/Dockerfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=alpine:3.19
6+
ARG IMAGE=alpine:3.20
77
FROM $IMAGE
88

99
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
1010

11-
ENV NGINX_VERSION=1.27.0
12-
ENV PKG_RELEASE=2
11+
ENV NGINX_VERSION=1.27.1
12+
ENV PKG_RELEASE=1
13+
ENV DYNPKG_RELEASE=2
1314

1415
ARG UID=101
1516
ARG GID=101
@@ -57,11 +58,12 @@ RUN set -x \
5758
bash \
5859
alpine-sdk \
5960
findutils \
61+
curl \
6062
&& su nobody -s /bin/sh -c " \
6163
export HOME=${tempDir} \
6264
&& cd ${tempDir} \
6365
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
64-
&& PKGOSSCHECKSUM=\"cd3333f4dfa4a873f6df73dfe24e047adc092d779aefb46577b6307ff0d0125543508694a80158b2bfc891167ad763b0d08287829df9924d4c22f50d063e76c0 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
66+
&& PKGOSSCHECKSUM=\"b9fbdf1779186fc02aa59dd87597fe4e906892391614289a4e6eedba398a3e770347b5b07110cca8c11fa3ba85bb711626ae69832e74c69ca8340d040a465907 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6567
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6668
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6769
else \

‎mainline/alpine/Dockerfile‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=nginxinc/nginx-unprivileged:1.27.0-alpine-slim
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.27.1-alpine-slim
77
FROM $IMAGE
88

9-
ENV NJS_VERSION=0.8.4
10-
ENV NJS_RELEASE=2
9+
ENV NJS_VERSION=0.8.5
10+
ENV NJS_RELEASE=1
1111

1212
ARG UID=101
1313
ARG GID=101
@@ -18,9 +18,9 @@ RUN set -x \
1818
&& apkArch="$(cat /etc/apk/arch)" \
1919
&& nginxPackages=" \
2020
nginx=${NGINX_VERSION}-r${PKG_RELEASE} \
21-
nginx-module-xslt=${NGINX_VERSION}-r${PKG_RELEASE} \
22-
nginx-module-geoip=${NGINX_VERSION}-r${PKG_RELEASE} \
23-
nginx-module-image-filter=${NGINX_VERSION}-r${PKG_RELEASE} \
21+
nginx-module-xslt=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
22+
nginx-module-geoip=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
23+
nginx-module-image-filter=${NGINX_VERSION}-r${DYNPKG_RELEASE} \
2424
nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-r${NJS_RELEASE} \
2525
" \
2626
# install prerequisites for public key and pkg-oss checks
@@ -52,11 +52,12 @@ RUN set -x \
5252
bash \
5353
alpine-sdk \
5454
findutils \
55+
curl \
5556
&& su nobody -s /bin/sh -c " \
5657
export HOME=${tempDir} \
5758
&& cd ${tempDir} \
5859
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
59-
&& PKGOSSCHECKSUM=\"cd3333f4dfa4a873f6df73dfe24e047adc092d779aefb46577b6307ff0d0125543508694a80158b2bfc891167ad763b0d08287829df9924d4c22f50d063e76c0 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
60+
&& PKGOSSCHECKSUM=\"b9fbdf1779186fc02aa59dd87597fe4e906892391614289a4e6eedba398a3e770347b5b07110cca8c11fa3ba85bb711626ae69832e74c69ca8340d040a465907 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6061
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6162
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6263
else \

‎mainline/debian-perl/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=nginxinc/nginx-unprivileged:1.27.0
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.27.1
77
FROM $IMAGE
88

99
ARG UID=101
@@ -16,10 +16,10 @@ RUN set -x; \
1616
dpkgArch="$(dpkg --print-architecture)" \
1717
&& nginxPackages=" \
1818
nginx=${NGINX_VERSION}-${PKG_RELEASE} \
19-
nginx-module-xslt=${NGINX_VERSION}-${PKG_RELEASE} \
20-
nginx-module-geoip=${NGINX_VERSION}-${PKG_RELEASE} \
21-
nginx-module-image-filter=${NGINX_VERSION}-${PKG_RELEASE} \
22-
nginx-module-perl=${NGINX_VERSION}-${PKG_RELEASE} \
19+
nginx-module-xslt=${NGINX_VERSION}-${DYNPKG_RELEASE} \
20+
nginx-module-geoip=${NGINX_VERSION}-${DYNPKG_RELEASE} \
21+
nginx-module-image-filter=${NGINX_VERSION}-${DYNPKG_RELEASE} \
22+
nginx-module-perl=${NGINX_VERSION}-${DYNPKG_RELEASE} \
2323
nginx-module-njs=${NGINX_VERSION}+${NJS_VERSION}-${NJS_RELEASE} \
2424
" \
2525
&& case "$dpkgArch" in \
@@ -43,11 +43,11 @@ RUN set -x; \
4343
\
4444
# build .deb files from upstream's source packages (which are verified by apt-get)
4545
&& apt-get update \
46-
&& apt-get build-dep -y nginx-module-perl=${NGINX_VERSION}-${PKG_RELEASE} \
46+
&& apt-get build-dep -y nginx-module-perl=${NGINX_VERSION}-${DYNPKG_RELEASE} \
4747
&& ( \
4848
cd "$tempDir" \
4949
&& DEB_BUILD_OPTIONS="nocheck parallel=$(nproc)" \
50-
apt-get source --compile nginx-module-perl=${NGINX_VERSION}-${PKG_RELEASE} \
50+
apt-get source --compile nginx-module-perl=${NGINX_VERSION}-${DYNPKG_RELEASE} \
5151
) \
5252
# we don't remove APT lists here because they get re-downloaded and removed later
5353
\

0 commit comments

Comments
 (0)