Skip to content

Commit f5bd472

Browse files
alessfgalessfg
committed
feat: Update mainline NGINX to 1.29.2
* Update mainline NGINX Debian base image to `trixie` * Replace mainline NGINX Debian `mips64le` arch with `riscv64` given the new arches supported by `trixie` * Update NJS to 0.9.3
1 parent dc31877 commit f5bd472

File tree

9 files changed

+28
-28
lines changed

9 files changed

+28
-28
lines changed

‎.github/workflows/debian-mainline.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
id: build
112112
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
113113
with:
114-
platforms: linux/amd64, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
114+
platforms: linux/amd64, linux/arm/v7, linux/arm64, linux/386, linux/ppc64le, linux/riscv64, linux/s390x
115115
# platforms: linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
116116
context: "{{ defaultContext }}:mainline/debian"
117117
labels: ${{ steps.meta.outputs.labels }}

‎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.1-alpine
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.29.2-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=\"43ecd667d9039c9ab0fab9068c16b37825b15f7d4ef6ea8f36a41378bdf1a198463c751f8b76cfe2aef7ffa8dd9f88f180b958a8189d770258b5a97dc302daf4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
60+
&& PKGOSSCHECKSUM=\"633b2a8b56bd48527d7e293a255fd706dfbb5a9c47605ff18e91a2a409801043ee00ecb0da5fadf9cdf1d483c5ca848e81c1861870619523e15ca9e494b6e700 *${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.1-alpine
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.29.2-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=\"43ecd667d9039c9ab0fab9068c16b37825b15f7d4ef6ea8f36a41378bdf1a198463c751f8b76cfe2aef7ffa8dd9f88f180b958a8189d770258b5a97dc302daf4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
55+
&& PKGOSSCHECKSUM=\"633b2a8b56bd48527d7e293a255fd706dfbb5a9c47605ff18e91a2a409801043ee00ecb0da5fadf9cdf1d483c5ca848e81c1861870619523e15ca9e494b6e700 *${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.1
11+
ENV NGINX_VERSION=1.29.2
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=\"43ecd667d9039c9ab0fab9068c16b37825b15f7d4ef6ea8f36a41378bdf1a198463c751f8b76cfe2aef7ffa8dd9f88f180b958a8189d770258b5a97dc302daf4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
66+
&& PKGOSSCHECKSUM=\"633b2a8b56bd48527d7e293a255fd706dfbb5a9c47605ff18e91a2a409801043ee00ecb0da5fadf9cdf1d483c5ca848e81c1861870619523e15ca9e494b6e700 *${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.1-alpine-slim
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.29.2-alpine-slim
77
FROM $IMAGE
88

9-
ENV NJS_VERSION=0.9.1
9+
ENV NJS_VERSION=0.9.3
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=\"43ecd667d9039c9ab0fab9068c16b37825b15f7d4ef6ea8f36a41378bdf1a198463c751f8b76cfe2aef7ffa8dd9f88f180b958a8189d770258b5a97dc302daf4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
60+
&& PKGOSSCHECKSUM=\"633b2a8b56bd48527d7e293a255fd706dfbb5a9c47605ff18e91a2a409801043ee00ecb0da5fadf9cdf1d483c5ca848e81c1861870619523e15ca9e494b6e700 *${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: 3 additions & 3 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.1
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.29.2
77
FROM $IMAGE
88

99
ENV OTEL_VERSION=0.1.2
@@ -27,7 +27,7 @@ RUN set -x; \
2727
&& case "$dpkgArch" in \
2828
amd64|arm64) \
2929
# arches officially built by upstream
30-
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \
30+
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ trixie nginx" >> /etc/apt/sources.list.d/nginx.list \
3131
&& apt-get update \
3232
;; \
3333
*) \
@@ -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="43ecd667d9039c9ab0fab9068c16b37825b15f7d4ef6ea8f36a41378bdf1a198463c751f8b76cfe2aef7ffa8dd9f88f180b958a8189d770258b5a97dc302daf4 *${REVISION}.tar.gz" \
59+
&& PKGOSSCHECKSUM="633b2a8b56bd48527d7e293a255fd706dfbb5a9c47605ff18e91a2a409801043ee00ecb0da5fadf9cdf1d483c5ca848e81c1861870619523e15ca9e494b6e700 *${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: 3 additions & 3 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.1
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.29.2
77
FROM $IMAGE
88

99
ARG UID=101
@@ -25,7 +25,7 @@ RUN set -x; \
2525
&& case "$dpkgArch" in \
2626
amd64|arm64) \
2727
# arches officially built by upstream
28-
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \
28+
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ trixie nginx" >> /etc/apt/sources.list.d/nginx.list \
2929
&& apt-get update \
3030
;; \
3131
*) \
@@ -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="43ecd667d9039c9ab0fab9068c16b37825b15f7d4ef6ea8f36a41378bdf1a198463c751f8b76cfe2aef7ffa8dd9f88f180b958a8189d770258b5a97dc302daf4 *${REVISION}.tar.gz" \
57+
&& PKGOSSCHECKSUM="633b2a8b56bd48527d7e293a255fd706dfbb5a9c47605ff18e91a2a409801043ee00ecb0da5fadf9cdf1d483c5ca848e81c1861870619523e15ca9e494b6e700 *${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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=debian:bookworm-slim
6+
ARG IMAGE=debian:trixie-slim
77
FROM $IMAGE
88

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

11-
ENV NGINX_VERSION=1.29.1
12-
ENV NJS_VERSION=0.9.1
13-
ENV NJS_RELEASE=1~bookworm
14-
ENV PKG_RELEASE=1~bookworm
15-
ENV DYNPKG_RELEASE=1~bookworm
11+
ENV NGINX_VERSION=1.29.2
12+
ENV NJS_VERSION=0.9.3
13+
ENV NJS_RELEASE=1~trixie
14+
ENV PKG_RELEASE=1~trixie
15+
ENV DYNPKG_RELEASE=1~trixie
1616

1717
ARG UID=101
1818
ARG GID=101
@@ -52,7 +52,7 @@ RUN set -x \
5252
&& case "$dpkgArch" in \
5353
amd64|arm64) \
5454
# arches officially built by upstream
55-
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \
55+
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ trixie nginx" >> /etc/apt/sources.list.d/nginx.list \
5656
&& apt-get update \
5757
;; \
5858
*) \
@@ -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="43ecd667d9039c9ab0fab9068c16b37825b15f7d4ef6ea8f36a41378bdf1a198463c751f8b76cfe2aef7ffa8dd9f88f180b958a8189d770258b5a97dc302daf4 *${REVISION}.tar.gz" \
84+
&& PKGOSSCHECKSUM="633b2a8b56bd48527d7e293a255fd706dfbb5a9c47605ff18e91a2a409801043ee00ecb0da5fadf9cdf1d483c5ca848e81c1861870619523e15ca9e494b6e700 *${REVISION}.tar.gz" \
8585
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
8686
echo "pkg-oss tarball checksum verification succeeded!"; \
8787
else \

‎update.sh‎

Lines changed: 4 additions & 4 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.1'
15+
[mainline]='1.29.2'
1616
[stable]='1.28.0'
1717
)
1818

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

@@ -50,7 +50,7 @@ declare -A dynpkg=(
5050
)
5151

5252
declare -A debian=(
53-
[mainline]='bookworm'
53+
[mainline]='trixie'
5454
[stable]='bookworm'
5555
)
5656

@@ -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]='43ecd667d9039c9ab0fab9068c16b37825b15f7d4ef6ea8f36a41378bdf1a198463c751f8b76cfe2aef7ffa8dd9f88f180b958a8189d770258b5a97dc302daf4'
75+
[mainline]='633b2a8b56bd48527d7e293a255fd706dfbb5a9c47605ff18e91a2a409801043ee00ecb0da5fadf9cdf1d483c5ca848e81c1861870619523e15ca9e494b6e700'
7676
[stable]='517bc18954ccf4efddd51986584ca1f37966833ad342a297e1fe58fd0faf14c5a4dabcb23519dca433878a2927a95d6bea05a6749ee2fa67a33bf24cdc41b1e4'
7777
)
7878

0 commit comments

Comments
 (0)