From 5cb399940fee7cce67910670f918b61f0629298e Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Wed, 13 Aug 2025 09:29:26 +0200 Subject: [PATCH] Update mainline to Debian trixie --- mainline/debian-otel/Dockerfile | 2 +- mainline/debian-perl/Dockerfile | 2 +- mainline/debian/Dockerfile | 10 +++++----- update.sh | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mainline/debian-otel/Dockerfile b/mainline/debian-otel/Dockerfile index 6bdb7325..41eb50f5 100644 --- a/mainline/debian-otel/Dockerfile +++ b/mainline/debian-otel/Dockerfile @@ -21,7 +21,7 @@ RUN set -x; \ && case "$dpkgArch" in \ amd64|arm64) \ # arches officialy built by upstream - echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \ + echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ trixie nginx" >> /etc/apt/sources.list.d/nginx.list \ && apt-get update \ ;; \ *) \ diff --git a/mainline/debian-perl/Dockerfile b/mainline/debian-perl/Dockerfile index 8e0e79ac..71a03461 100644 --- a/mainline/debian-perl/Dockerfile +++ b/mainline/debian-perl/Dockerfile @@ -19,7 +19,7 @@ RUN set -x; \ && case "$dpkgArch" in \ amd64|arm64) \ # arches officialy built by upstream - echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \ + echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ trixie nginx" >> /etc/apt/sources.list.d/nginx.list \ && apt-get update \ ;; \ *) \ diff --git a/mainline/debian/Dockerfile b/mainline/debian/Dockerfile index 3d08fc15..ecc07412 100644 --- a/mainline/debian/Dockerfile +++ b/mainline/debian/Dockerfile @@ -3,15 +3,15 @@ # # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bookworm-slim +FROM debian:trixie-slim LABEL maintainer="NGINX Docker Maintainers " ENV NGINX_VERSION 1.29.1 ENV NJS_VERSION 0.9.1 -ENV NJS_RELEASE 1~bookworm -ENV PKG_RELEASE 1~bookworm -ENV DYNPKG_RELEASE 1~bookworm +ENV NJS_RELEASE 1~trixie +ENV PKG_RELEASE 1~trixie +ENV DYNPKG_RELEASE 1~trixie RUN set -x \ # create nginx user/group first, to be consistent throughout docker variants @@ -48,7 +48,7 @@ RUN set -x \ && case "$dpkgArch" in \ amd64|arm64) \ # arches officialy built by upstream - echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \ + echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ trixie nginx" >> /etc/apt/sources.list.d/nginx.list \ && apt-get update \ ;; \ *) \ diff --git a/update.sh b/update.sh index 65e54101..0b8af179 100755 --- a/update.sh +++ b/update.sh @@ -50,7 +50,7 @@ declare -A dynpkg=( ) declare -A debian=( - [mainline]='bookworm' + [mainline]='trixie' [stable]='bookworm' )