Skip to content

Commit 872c2c0

Browse files
alessfgalessfg
authored
feat: Update mainline NGINX to 1.29.1 (#339)
1 parent ac48fea commit 872c2c0

File tree

10 files changed

+25
-25
lines changed

10 files changed

+25
-25
lines changed

‎Dockerfile-debian.template‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ RUN set -x \
2929
pgp.mit.edu \
3030
; do \
3131
echo "Fetching GPG key $NGINX_GPGKEY from $server"; \
32-
gpg1 --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
32+
gpg1 --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
3333
done; \
3434
test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
3535
done; \
36-
gpg1 --export $NGINX_GPGKEYS > "$NGINX_GPGKEY_PATH" ; \
36+
gpg1 --batch --export $NGINX_GPGKEYS > "$NGINX_GPGKEY_PATH" ; \
3737
rm -rf "$GNUPGHOME"; \
3838
apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
3939
&& dpkgArch="$(dpkg --print-architecture)" \

‎mainline/alpine-otel/Dockerfile‎

Lines changed: 2 additions & 2 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.29.0-alpine
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.29.1-alpine
77
FROM $IMAGE
88

99
ENV OTEL_VERSION=0.1.2
@@ -57,7 +57,7 @@ RUN set -x \
5757
export HOME=${tempDir} \
5858
&& cd ${tempDir} \
5959
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
60-
&& PKGOSSCHECKSUM=\"400593da45fc0195a01138c0c23a06059da1c6a2e26959f2c4c95fbaf63436ff211665ef01392d2b775a0133d5b57680dabe51b840a55f82e89621e84cf651d1 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
60+
&& PKGOSSCHECKSUM=\"43ecd667d9039c9ab0fab9068c16b37825b15f7d4ef6ea8f36a41378bdf1a198463c751f8b76cfe2aef7ffa8dd9f88f180b958a8189d770258b5a97dc302daf4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6161
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6262
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6363
else \

‎mainline/alpine-perl/Dockerfile‎

Lines changed: 2 additions & 2 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.29.0-alpine
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.29.1-alpine
77
FROM $IMAGE
88

99
ARG UID=101
@@ -52,7 +52,7 @@ RUN set -x \
5252
export HOME=${tempDir} \
5353
&& cd ${tempDir} \
5454
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
55-
&& PKGOSSCHECKSUM=\"400593da45fc0195a01138c0c23a06059da1c6a2e26959f2c4c95fbaf63436ff211665ef01392d2b775a0133d5b57680dabe51b840a55f82e89621e84cf651d1 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
55+
&& PKGOSSCHECKSUM=\"43ecd667d9039c9ab0fab9068c16b37825b15f7d4ef6ea8f36a41378bdf1a198463c751f8b76cfe2aef7ffa8dd9f88f180b958a8189d770258b5a97dc302daf4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
5656
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5757
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5858
else \

‎mainline/alpine-slim/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM $IMAGE
88

99
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
1010

11-
ENV NGINX_VERSION=1.29.0
11+
ENV NGINX_VERSION=1.29.1
1212
ENV PKG_RELEASE=1
1313
ENV DYNPKG_RELEASE=1
1414

@@ -63,7 +63,7 @@ RUN set -x \
6363
export HOME=${tempDir} \
6464
&& cd ${tempDir} \
6565
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
66-
&& PKGOSSCHECKSUM=\"400593da45fc0195a01138c0c23a06059da1c6a2e26959f2c4c95fbaf63436ff211665ef01392d2b775a0133d5b57680dabe51b840a55f82e89621e84cf651d1 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
66+
&& PKGOSSCHECKSUM=\"43ecd667d9039c9ab0fab9068c16b37825b15f7d4ef6ea8f36a41378bdf1a198463c751f8b76cfe2aef7ffa8dd9f88f180b958a8189d770258b5a97dc302daf4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6767
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6868
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6969
else \

‎mainline/alpine/Dockerfile‎

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

9-
ENV NJS_VERSION=0.9.0
9+
ENV NJS_VERSION=0.9.1
1010
ENV NJS_RELEASE=1
1111

1212
ARG UID=101
@@ -57,7 +57,7 @@ RUN set -x \
5757
export HOME=${tempDir} \
5858
&& cd ${tempDir} \
5959
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
60-
&& PKGOSSCHECKSUM=\"400593da45fc0195a01138c0c23a06059da1c6a2e26959f2c4c95fbaf63436ff211665ef01392d2b775a0133d5b57680dabe51b840a55f82e89621e84cf651d1 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
60+
&& PKGOSSCHECKSUM=\"43ecd667d9039c9ab0fab9068c16b37825b15f7d4ef6ea8f36a41378bdf1a198463c751f8b76cfe2aef7ffa8dd9f88f180b958a8189d770258b5a97dc302daf4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6161
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6262
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6363
else \

‎mainline/debian-otel/Dockerfile‎

Lines changed: 2 additions & 2 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.29.0
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.29.1
77
FROM $IMAGE
88

99
ENV OTEL_VERSION=0.1.2
@@ -56,7 +56,7 @@ RUN set -x; \
5656
&& REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \
5757
&& REVISION=${REVISION%~*} \
5858
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \
59-
&& PKGOSSCHECKSUM="400593da45fc0195a01138c0c23a06059da1c6a2e26959f2c4c95fbaf63436ff211665ef01392d2b775a0133d5b57680dabe51b840a55f82e89621e84cf651d1 *${REVISION}.tar.gz" \
59+
&& PKGOSSCHECKSUM="43ecd667d9039c9ab0fab9068c16b37825b15f7d4ef6ea8f36a41378bdf1a198463c751f8b76cfe2aef7ffa8dd9f88f180b958a8189d770258b5a97dc302daf4 *${REVISION}.tar.gz" \
6060
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
6161
echo "pkg-oss tarball checksum verification succeeded!"; \
6262
else \

‎mainline/debian-perl/Dockerfile‎

Lines changed: 2 additions & 2 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.29.0
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.29.1
77
FROM $IMAGE
88

99
ARG UID=101
@@ -54,7 +54,7 @@ RUN set -x; \
5454
&& REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \
5555
&& REVISION=${REVISION%~*} \
5656
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \
57-
&& PKGOSSCHECKSUM="400593da45fc0195a01138c0c23a06059da1c6a2e26959f2c4c95fbaf63436ff211665ef01392d2b775a0133d5b57680dabe51b840a55f82e89621e84cf651d1 *${REVISION}.tar.gz" \
57+
&& PKGOSSCHECKSUM="43ecd667d9039c9ab0fab9068c16b37825b15f7d4ef6ea8f36a41378bdf1a198463c751f8b76cfe2aef7ffa8dd9f88f180b958a8189d770258b5a97dc302daf4 *${REVISION}.tar.gz" \
5858
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
5959
echo "pkg-oss tarball checksum verification succeeded!"; \
6060
else \

‎mainline/debian/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ FROM $IMAGE
88

99
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
1010

11-
ENV NGINX_VERSION=1.29.0
12-
ENV NJS_VERSION=0.9.0
11+
ENV NGINX_VERSION=1.29.1
12+
ENV NJS_VERSION=0.9.1
1313
ENV NJS_RELEASE=1~bookworm
1414
ENV PKG_RELEASE=1~bookworm
1515
ENV DYNPKG_RELEASE=1~bookworm
@@ -34,11 +34,11 @@ RUN set -x \
3434
pgp.mit.edu \
3535
; do \
3636
echo "Fetching GPG key $NGINX_GPGKEY from $server"; \
37-
gpg1 --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
37+
gpg1 --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
3838
done; \
3939
test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
4040
done; \
41-
gpg1 --export $NGINX_GPGKEYS > "$NGINX_GPGKEY_PATH" ; \
41+
gpg1 --batch --export $NGINX_GPGKEYS > "$NGINX_GPGKEY_PATH" ; \
4242
rm -rf "$GNUPGHOME"; \
4343
apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
4444
&& dpkgArch="$(dpkg --print-architecture)" \
@@ -81,7 +81,7 @@ RUN set -x \
8181
&& REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \
8282
&& REVISION=${REVISION%~*} \
8383
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \
84-
&& PKGOSSCHECKSUM="400593da45fc0195a01138c0c23a06059da1c6a2e26959f2c4c95fbaf63436ff211665ef01392d2b775a0133d5b57680dabe51b840a55f82e89621e84cf651d1 *${REVISION}.tar.gz" \
84+
&& PKGOSSCHECKSUM="43ecd667d9039c9ab0fab9068c16b37825b15f7d4ef6ea8f36a41378bdf1a198463c751f8b76cfe2aef7ffa8dd9f88f180b958a8189d770258b5a97dc302daf4 *${REVISION}.tar.gz" \
8585
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
8686
echo "pkg-oss tarball checksum verification succeeded!"; \
8787
else \

‎stable/debian/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ RUN set -x \
3434
pgp.mit.edu \
3535
; do \
3636
echo "Fetching GPG key $NGINX_GPGKEY from $server"; \
37-
gpg1 --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
37+
gpg1 --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
3838
done; \
3939
test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
4040
done; \
41-
gpg1 --export $NGINX_GPGKEYS > "$NGINX_GPGKEY_PATH" ; \
41+
gpg1 --batch --export $NGINX_GPGKEYS > "$NGINX_GPGKEY_PATH" ; \
4242
rm -rf "$GNUPGHOME"; \
4343
apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
4444
&& dpkgArch="$(dpkg --print-architecture)" \

‎update.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ declare branches=(
1212
# Current nginx versions
1313
# Remember to update pkgosschecksum when changing this.
1414
declare -A nginx=(
15-
[mainline]='1.29.0'
15+
[mainline]='1.29.1'
1616
[stable]='1.28.0'
1717
)
1818

1919
# Current njs versions
2020
declare -A njs=(
21-
[mainline]='0.9.0'
21+
[mainline]='0.9.1'
2222
[stable]='0.8.10'
2323
)
2424

@@ -72,7 +72,7 @@ declare -A rev=(
7272
# revision/tag in the previous block
7373
# Used in builds for architectures not packaged by nginx.org
7474
declare -A pkgosschecksum=(
75-
[mainline]='400593da45fc0195a01138c0c23a06059da1c6a2e26959f2c4c95fbaf63436ff211665ef01392d2b775a0133d5b57680dabe51b840a55f82e89621e84cf651d1'
75+
[mainline]='43ecd667d9039c9ab0fab9068c16b37825b15f7d4ef6ea8f36a41378bdf1a198463c751f8b76cfe2aef7ffa8dd9f88f180b958a8189d770258b5a97dc302daf4'
7676
[stable]='517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4'
7777
)
7878

0 commit comments

Comments
 (0)