Update httpd

[yosifkit]

Changes:

• docker-library/httpd@75c46cc: Merge pull request Update to Debian Trixie httpd#275 from infosiftr/trixie
• docker-library/httpd@684a447: Update to Debian Trixie

[github-actions]

Diff for 31c2005:

diff --git a/_bashbrew-arches b/_bashbrew-arches
index 3616e93..a37aa8b 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -4,7 +4,6 @@ arm32v6
 arm32v7
 arm64v8
 i386
-mips64le
 ppc64le
 riscv64
 s390x
diff --git a/_bashbrew-cat b/_bashbrew-cat
index c8b25e8..74de28e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,9 +1,9 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/httpd.git
 
-Tags: 2.4.65, 2.4, 2, latest, 2.4.65-bookworm, 2.4-bookworm, 2-bookworm, bookworm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 42b1c8997488557ae90e80ff64a90830b1563d75
+Tags: 2.4.65, 2.4, 2, latest, 2.4.65-trixie, 2.4-trixie, 2-trixie, trixie
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 684a447a23a8035356d5cce42e1f85212cfd39a3
 Directory: 2.4
 
 Tags: 2.4.65-alpine, 2.4-alpine, 2-alpine, alpine, 2.4.65-alpine3.22, 2.4-alpine3.22, 2-alpine3.22, alpine3.22
diff --git a/_bashbrew-list b/_bashbrew-list
index 211686c..fdb2511 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,16 +1,16 @@
 httpd:2
 httpd:2-alpine
 httpd:2-alpine3.22
-httpd:2-bookworm
+httpd:2-trixie
 httpd:2.4
 httpd:2.4-alpine
 httpd:2.4-alpine3.22
-httpd:2.4-bookworm
+httpd:2.4-trixie
 httpd:2.4.65
 httpd:2.4.65-alpine
 httpd:2.4.65-alpine3.22
-httpd:2.4.65-bookworm
+httpd:2.4.65-trixie
 httpd:alpine
 httpd:alpine3.22
-httpd:bookworm
 httpd:latest
+httpd:trixie
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 5dc8491..b687aa3 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,2 +1,2 @@
 httpd:alpine3.22
-httpd:bookworm
+httpd:trixie
diff --git a/httpd_bookworm/Dockerfile b/httpd_trixie/Dockerfile
similarity index 97%
rename from httpd_bookworm/Dockerfile
rename to httpd_trixie/Dockerfile
index ec19763..f2b01b6 100644
--- a/httpd_bookworm/Dockerfile
+++ b/httpd_trixie/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 #RUN groupadd -r www-data && useradd -r --create-home -g www-data www-data
@@ -12,15 +12,14 @@ WORKDIR $HTTPD_PREFIX
 # install httpd runtime dependencies
 # https://httpd.apache.org/docs/2.4/install.html#requirements
 RUN set -eux; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
+	apt-get install --update -y --no-install-recommends \
 # https://github.com/docker-library/httpd/issues/214
 		ca-certificates \
 		libaprutil1-ldap \
 # https://github.com/docker-library/httpd/issues/209
 		libldap-common \
 	; \
-	rm -rf /var/lib/apt/lists/*
+	apt-get dist-clean
 
 ENV HTTPD_VERSION 2.4.65
 ENV HTTPD_SHA256 58b8be97d9940ec17f7656c0c6b9f41b618aac468b894b534148e3296c53b8b3
@@ -34,8 +33,7 @@ RUN set -eux; \
 	# mod_http2 mod_lua mod_proxy_html mod_xml2enc
 	# https://anonscm.debian.org/cgit/pkg-apache/apache2.git/tree/debian/control?id=adb6f181257af28ee67af15fc49d2699a0080d4c
 	savedAptMark="$(apt-mark showmanual)"; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
+	apt-get install --update -y --no-install-recommends \
 		bzip2 \
 		dpkg-dev \
 		gcc \
@@ -47,7 +45,7 @@ RUN set -eux; \
 		libjansson-dev \
 		liblua5.2-dev \
 		libnghttp2-dev \
-		libpcre3-dev \
+		libpcre2-dev \
 		libssl-dev \
 		libxml2-dev \
 		make \
@@ -55,7 +53,6 @@ RUN set -eux; \
 		wget \
 		zlib1g-dev \
 	; \
-	rm -r /var/lib/apt/lists/*; \
 	\
 	ddist() { \
 		local f="$1"; shift; \
@@ -223,6 +220,7 @@ RUN set -eux; \
 		| xargs -r apt-mark manual \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	apt-get dist-clean; \
 	\
 # smoke test
 	httpd -v
diff --git a/httpd_bookworm/httpd-foreground b/httpd_trixie/httpd-foreground
similarity index 100%
rename from httpd_bookworm/httpd-foreground
rename to httpd_trixie/httpd-foreground

Relevant Maintainers:

• httpd: @tianon @yosifkit

[tianon]

Hold till after the debian:trixie release image build.