Update haproxy #19665
Merged
Update haproxy #19665
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/haproxy@22356f3: Merge pull request docker-library/haproxy#249 from infosiftr/trixie - docker-library/haproxy@2ff3f8b: Update to Debian Trixie
Diff for 741c8b1: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 be8a293..5dc9e37 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/haproxy.git
-Tags: 2.4.29, 2.4, 2.4.29-bookworm, 2.4-bookworm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c153740fe581f5c43c6c5571acd00055e49e478d
+Tags: 2.4.29, 2.4, 2.4.29-trixie, 2.4-trixie
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 2ff3f8bcd0304645bd56e5c6118fa8989f8bba00
Directory: 2.4
Tags: 2.4.29-alpine, 2.4-alpine, 2.4.29-alpine3.22, 2.4-alpine3.22
@@ -11,9 +11,9 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 3117d2496500d354bb79eff90b6ba247fb456276
Directory: 2.4/alpine
-Tags: 2.6.22, 2.6, 2.6.22-bookworm, 2.6-bookworm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c153740fe581f5c43c6c5571acd00055e49e478d
+Tags: 2.6.22, 2.6, 2.6.22-trixie, 2.6-trixie
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 2ff3f8bcd0304645bd56e5c6118fa8989f8bba00
Directory: 2.6
Tags: 2.6.22-alpine, 2.6-alpine, 2.6.22-alpine3.22, 2.6-alpine3.22
@@ -21,9 +21,9 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 3117d2496500d354bb79eff90b6ba247fb456276
Directory: 2.6/alpine
-Tags: 2.8.15, 2.8, 2.8.15-bookworm, 2.8-bookworm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c153740fe581f5c43c6c5571acd00055e49e478d
+Tags: 2.8.15, 2.8, 2.8.15-trixie, 2.8-trixie
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 2ff3f8bcd0304645bd56e5c6118fa8989f8bba00
Directory: 2.8
Tags: 2.8.15-alpine, 2.8-alpine, 2.8.15-alpine3.22, 2.8-alpine3.22
@@ -31,9 +31,9 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 3117d2496500d354bb79eff90b6ba247fb456276
Directory: 2.8/alpine
-Tags: 3.0.11, 3.0, 3.0.11-bookworm, 3.0-bookworm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 6fa540dd7d9d82634605e727a8e1c726a23d8b0d
+Tags: 3.0.11, 3.0, 3.0.11-trixie, 3.0-trixie
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 2ff3f8bcd0304645bd56e5c6118fa8989f8bba00
Directory: 3.0
Tags: 3.0.11-alpine, 3.0-alpine, 3.0.11-alpine3.22, 3.0-alpine3.22
@@ -41,9 +41,9 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 6fa540dd7d9d82634605e727a8e1c726a23d8b0d
Directory: 3.0/alpine
-Tags: 3.1.8, 3.1, 3.1.8-bookworm, 3.1-bookworm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: d9460179b64eac94bd181a488a74d8e6df7bdbf5
+Tags: 3.1.8, 3.1, 3.1.8-trixie, 3.1-trixie
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 2ff3f8bcd0304645bd56e5c6118fa8989f8bba00
Directory: 3.1
Tags: 3.1.8-alpine, 3.1-alpine, 3.1.8-alpine3.22, 3.1-alpine3.22
@@ -51,9 +51,9 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: d9460179b64eac94bd181a488a74d8e6df7bdbf5
Directory: 3.1/alpine
-Tags: 3.2.3, 3.2, latest, lts, 3.2.3-bookworm, 3.2-bookworm, bookworm, lts-bookworm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 3b6ff7d6c6c2562948c4e91e6f592e176eab5e0f
+Tags: 3.2.3, 3.2, latest, lts, 3.2.3-trixie, 3.2-trixie, trixie, lts-trixie
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 2ff3f8bcd0304645bd56e5c6118fa8989f8bba00
Directory: 3.2
Tags: 3.2.3-alpine, 3.2-alpine, alpine, lts-alpine, 3.2.3-alpine3.22, 3.2-alpine3.22, alpine3.22, lts-alpine3.22
@@ -61,9 +61,9 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 3b6ff7d6c6c2562948c4e91e6f592e176eab5e0f
Directory: 3.2/alpine
-Tags: 3.3-dev6, 3.3-dev, 3.3-dev6-bookworm, 3.3-dev-bookworm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 65c563d1acf447e3db0f03f531302fdd1a39c738
+Tags: 3.3-dev6, 3.3-dev, 3.3-dev6-trixie, 3.3-dev-trixie
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 2ff3f8bcd0304645bd56e5c6118fa8989f8bba00
Directory: 3.3
Tags: 3.3-dev6-alpine, 3.3-dev-alpine, 3.3-dev6-alpine3.22, 3.3-dev-alpine3.22
diff --git a/_bashbrew-list b/_bashbrew-list
index 1946dc9..3de3371 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,64 +1,64 @@
haproxy:2.4
haproxy:2.4-alpine
haproxy:2.4-alpine3.22
-haproxy:2.4-bookworm
+haproxy:2.4-trixie
haproxy:2.4.29
haproxy:2.4.29-alpine
haproxy:2.4.29-alpine3.22
-haproxy:2.4.29-bookworm
+haproxy:2.4.29-trixie
haproxy:2.6
haproxy:2.6-alpine
haproxy:2.6-alpine3.22
-haproxy:2.6-bookworm
+haproxy:2.6-trixie
haproxy:2.6.22
haproxy:2.6.22-alpine
haproxy:2.6.22-alpine3.22
-haproxy:2.6.22-bookworm
+haproxy:2.6.22-trixie
haproxy:2.8
haproxy:2.8-alpine
haproxy:2.8-alpine3.22
-haproxy:2.8-bookworm
+haproxy:2.8-trixie
haproxy:2.8.15
haproxy:2.8.15-alpine
haproxy:2.8.15-alpine3.22
-haproxy:2.8.15-bookworm
+haproxy:2.8.15-trixie
haproxy:3.0
haproxy:3.0-alpine
haproxy:3.0-alpine3.22
-haproxy:3.0-bookworm
+haproxy:3.0-trixie
haproxy:3.0.11
haproxy:3.0.11-alpine
haproxy:3.0.11-alpine3.22
-haproxy:3.0.11-bookworm
+haproxy:3.0.11-trixie
haproxy:3.1
haproxy:3.1-alpine
haproxy:3.1-alpine3.22
-haproxy:3.1-bookworm
+haproxy:3.1-trixie
haproxy:3.1.8
haproxy:3.1.8-alpine
haproxy:3.1.8-alpine3.22
-haproxy:3.1.8-bookworm
+haproxy:3.1.8-trixie
haproxy:3.2
haproxy:3.2-alpine
haproxy:3.2-alpine3.22
-haproxy:3.2-bookworm
+haproxy:3.2-trixie
haproxy:3.2.3
haproxy:3.2.3-alpine
haproxy:3.2.3-alpine3.22
-haproxy:3.2.3-bookworm
+haproxy:3.2.3-trixie
haproxy:3.3-dev
haproxy:3.3-dev6
haproxy:3.3-dev6-alpine
haproxy:3.3-dev6-alpine3.22
-haproxy:3.3-dev6-bookworm
+haproxy:3.3-dev6-trixie
haproxy:3.3-dev-alpine
haproxy:3.3-dev-alpine3.22
-haproxy:3.3-dev-bookworm
+haproxy:3.3-dev-trixie
haproxy:alpine
haproxy:alpine3.22
-haproxy:bookworm
haproxy:latest
haproxy:lts
haproxy:lts-alpine
haproxy:lts-alpine3.22
-haproxy:lts-bookworm
+haproxy:lts-trixie
+haproxy:trixie
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 4aca7c1..55ddfec 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,14 +1,14 @@
haproxy:2.4-alpine3.22
-haproxy:2.4-bookworm
+haproxy:2.4-trixie
haproxy:2.6-alpine3.22
-haproxy:2.6-bookworm
+haproxy:2.6-trixie
haproxy:2.8-alpine3.22
-haproxy:2.8-bookworm
+haproxy:2.8-trixie
haproxy:3.0-alpine3.22
-haproxy:3.0-bookworm
+haproxy:3.0-trixie
haproxy:3.1-alpine3.22
-haproxy:3.1-bookworm
+haproxy:3.1-trixie
haproxy:3.3-dev-alpine3.22
-haproxy:3.3-dev-bookworm
+haproxy:3.3-dev-trixie
haproxy:lts-alpine3.22
-haproxy:lts-bookworm
+haproxy:lts-trixie
diff --git a/haproxy_2.4-bookworm/Dockerfile b/haproxy_2.4-trixie/Dockerfile
similarity index 93%
rename from haproxy_2.4-bookworm/Dockerfile
rename to haproxy_2.4-trixie/Dockerfile
index e862e01..f5ff1d4 100644
--- a/haproxy_2.4-bookworm/Dockerfile
+++ b/haproxy_2.4-trixie/Dockerfile
@@ -4,16 +4,15 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# runtime dependencies
RUN set -eux; \
- apt-get update; \
- apt-get install -y --no-install-recommends \
+ apt-get install --update -y --no-install-recommends \
# @system-ca: https://github.com/docker-library/haproxy/pull/216
ca-certificates \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
# roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6
RUN set -eux; \
@@ -37,7 +36,7 @@ ENV HAPROXY_SHA256 89e1e675bfecc88624c19850fd6b69f7b91f112d61f30a3b20a625298ef1f
RUN set -eux; \
\
savedAptMark="$(apt-mark showmanual)"; \
- apt-get update && apt-get install -y --no-install-recommends \
+ apt-get install --update -y --no-install-recommends \
gcc \
libc6-dev \
liblua5.3-dev \
@@ -46,7 +45,6 @@ RUN set -eux; \
make \
wget \
; \
- rm -rf /var/lib/apt/lists/*; \
\
wget -O haproxy.tar.gz "$HAPROXY_URL"; \
echo "$HAPROXY_SHA256 *haproxy.tar.gz" | sha256sum -c; \
@@ -87,6 +85,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
haproxy -v
diff --git a/haproxy_2.4-bookworm/docker-entrypoint.sh b/haproxy_2.4-trixie/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.4-bookworm/docker-entrypoint.sh
rename to haproxy_2.4-trixie/docker-entrypoint.sh
diff --git a/haproxy_2.6-bookworm/Dockerfile b/haproxy_2.6-trixie/Dockerfile
similarity index 93%
rename from haproxy_2.6-bookworm/Dockerfile
rename to haproxy_2.6-trixie/Dockerfile
index deeca8e..15051b2 100644
--- a/haproxy_2.6-bookworm/Dockerfile
+++ b/haproxy_2.6-trixie/Dockerfile
@@ -4,16 +4,15 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# runtime dependencies
RUN set -eux; \
- apt-get update; \
- apt-get install -y --no-install-recommends \
+ apt-get install --update -y --no-install-recommends \
# @system-ca: https://github.com/docker-library/haproxy/pull/216
ca-certificates \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
# roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6
RUN set -eux; \
@@ -37,7 +36,7 @@ ENV HAPROXY_SHA256 4c0797f450f997dc287d2c7aafa7a0e5b7a2d71593a2cd58e664e8f3aea61
RUN set -eux; \
\
savedAptMark="$(apt-mark showmanual)"; \
- apt-get update && apt-get install -y --no-install-recommends \
+ apt-get install --update -y --no-install-recommends \
gcc \
libc6-dev \
liblua5.3-dev \
@@ -46,7 +45,6 @@ RUN set -eux; \
make \
wget \
; \
- rm -rf /var/lib/apt/lists/*; \
\
wget -O haproxy.tar.gz "$HAPROXY_URL"; \
echo "$HAPROXY_SHA256 *haproxy.tar.gz" | sha256sum -c; \
@@ -87,6 +85,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
haproxy -v
diff --git a/haproxy_2.6-bookworm/docker-entrypoint.sh b/haproxy_2.6-trixie/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.6-bookworm/docker-entrypoint.sh
rename to haproxy_2.6-trixie/docker-entrypoint.sh
diff --git a/haproxy_2.8-bookworm/Dockerfile b/haproxy_2.8-trixie/Dockerfile
similarity index 93%
rename from haproxy_2.8-bookworm/Dockerfile
rename to haproxy_2.8-trixie/Dockerfile
index fb609c5..e312e31 100644
--- a/haproxy_2.8-bookworm/Dockerfile
+++ b/haproxy_2.8-trixie/Dockerfile
@@ -4,16 +4,15 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# runtime dependencies
RUN set -eux; \
- apt-get update; \
- apt-get install -y --no-install-recommends \
+ apt-get install --update -y --no-install-recommends \
# @system-ca: https://github.com/docker-library/haproxy/pull/216
ca-certificates \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
# roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6
RUN set -eux; \
@@ -37,7 +36,7 @@ ENV HAPROXY_SHA256 98f0551b9c3041a87869f4cd4e1465adf6fbef2056e83aabea92106032585
RUN set -eux; \
\
savedAptMark="$(apt-mark showmanual)"; \
- apt-get update && apt-get install -y --no-install-recommends \
+ apt-get install --update -y --no-install-recommends \
gcc \
libc6-dev \
liblua5.3-dev \
@@ -46,7 +45,6 @@ RUN set -eux; \
make \
wget \
; \
- rm -rf /var/lib/apt/lists/*; \
\
wget -O haproxy.tar.gz "$HAPROXY_URL"; \
echo "$HAPROXY_SHA256 *haproxy.tar.gz" | sha256sum -c; \
@@ -87,6 +85,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
haproxy -v
diff --git a/haproxy_2.8-bookworm/docker-entrypoint.sh b/haproxy_2.8-trixie/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.8-bookworm/docker-entrypoint.sh
rename to haproxy_2.8-trixie/docker-entrypoint.sh
diff --git a/haproxy_3.0-bookworm/Dockerfile b/haproxy_3.0-trixie/Dockerfile
similarity index 93%
rename from haproxy_3.0-bookworm/Dockerfile
rename to haproxy_3.0-trixie/Dockerfile
index 13e90b8..6e6e819 100644
--- a/haproxy_3.0-bookworm/Dockerfile
+++ b/haproxy_3.0-trixie/Dockerfile
@@ -4,16 +4,15 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# runtime dependencies
RUN set -eux; \
- apt-get update; \
- apt-get install -y --no-install-recommends \
+ apt-get install --update -y --no-install-recommends \
# @system-ca: https://github.com/docker-library/haproxy/pull/216
ca-certificates \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
# roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6
RUN set -eux; \
@@ -37,7 +36,7 @@ ENV HAPROXY_SHA256 a133e2d550c5fd9a849b5c7ab17bb945bcdad209ca140d41f45ebf31943ae
RUN set -eux; \
\
savedAptMark="$(apt-mark showmanual)"; \
- apt-get update && apt-get install -y --no-install-recommends \
+ apt-get install --update -y --no-install-recommends \
gcc \
libc6-dev \
liblua5.4-dev \
@@ -46,7 +45,6 @@ RUN set -eux; \
make \
wget \
; \
- rm -rf /var/lib/apt/lists/*; \
\
wget -O haproxy.tar.gz "$HAPROXY_URL"; \
echo "$HAPROXY_SHA256 *haproxy.tar.gz" | sha256sum -c; \
@@ -87,6 +85,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
haproxy -v
diff --git a/haproxy_3.0-bookworm/docker-entrypoint.sh b/haproxy_3.0-trixie/docker-entrypoint.sh
similarity index 100%
rename from haproxy_3.0-bookworm/docker-entrypoint.sh
rename to haproxy_3.0-trixie/docker-entrypoint.sh
diff --git a/haproxy_3.1-bookworm/Dockerfile b/haproxy_3.1-trixie/Dockerfile
similarity index 93%
rename from haproxy_3.1-bookworm/Dockerfile
rename to haproxy_3.1-trixie/Dockerfile
index 900f9ea..8ef863c 100644
--- a/haproxy_3.1-bookworm/Dockerfile
+++ b/haproxy_3.1-trixie/Dockerfile
@@ -4,16 +4,15 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# runtime dependencies
RUN set -eux; \
- apt-get update; \
- apt-get install -y --no-install-recommends \
+ apt-get install --update -y --no-install-recommends \
# @system-ca: https://github.com/docker-library/haproxy/pull/216
ca-certificates \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
# roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6
RUN set -eux; \
@@ -37,7 +36,7 @@ ENV HAPROXY_SHA256 6f249014b547d34fb41e19867746ec4da4ea7be0c0ce3b56f3cfde57ca3b2
RUN set -eux; \
\
savedAptMark="$(apt-mark showmanual)"; \
- apt-get update && apt-get install -y --no-install-recommends \
+ apt-get install --update -y --no-install-recommends \
gcc \
libc6-dev \
liblua5.4-dev \
@@ -46,7 +45,6 @@ RUN set -eux; \
make \
wget \
; \
- rm -rf /var/lib/apt/lists/*; \
\
wget -O haproxy.tar.gz "$HAPROXY_URL"; \
echo "$HAPROXY_SHA256 *haproxy.tar.gz" | sha256sum -c; \
@@ -87,6 +85,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
haproxy -v
diff --git a/haproxy_3.1-bookworm/docker-entrypoint.sh b/haproxy_3.1-trixie/docker-entrypoint.sh
similarity index 100%
rename from haproxy_3.1-bookworm/docker-entrypoint.sh
rename to haproxy_3.1-trixie/docker-entrypoint.sh
diff --git a/haproxy_3.3-dev-bookworm/Dockerfile b/haproxy_3.3-dev-trixie/Dockerfile
similarity index 93%
rename from haproxy_3.3-dev-bookworm/Dockerfile
rename to haproxy_3.3-dev-trixie/Dockerfile
index 3736191..fb7552c 100644
--- a/haproxy_3.3-dev-bookworm/Dockerfile
+++ b/haproxy_3.3-dev-trixie/Dockerfile
@@ -4,16 +4,15 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# runtime dependencies
RUN set -eux; \
- apt-get update; \
- apt-get install -y --no-install-recommends \
+ apt-get install --update -y --no-install-recommends \
# @system-ca: https://github.com/docker-library/haproxy/pull/216
ca-certificates \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
# roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6
RUN set -eux; \
@@ -37,7 +36,7 @@ ENV HAPROXY_SHA256 35f1cd784f9af44f85bbc1e978a12422f5ab4e2d5d63df6aab96c47e2defb
RUN set -eux; \
\
savedAptMark="$(apt-mark showmanual)"; \
- apt-get update && apt-get install -y --no-install-recommends \
+ apt-get install --update -y --no-install-recommends \
gcc \
libc6-dev \
liblua5.4-dev \
@@ -46,7 +45,6 @@ RUN set -eux; \
make \
wget \
; \
- rm -rf /var/lib/apt/lists/*; \
\
wget -O haproxy.tar.gz "$HAPROXY_URL"; \
echo "$HAPROXY_SHA256 *haproxy.tar.gz" | sha256sum -c; \
@@ -87,6 +85,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
haproxy -v
diff --git a/haproxy_3.3-dev-bookworm/docker-entrypoint.sh b/haproxy_3.3-dev-trixie/docker-entrypoint.sh
similarity index 100%
rename from haproxy_3.3-dev-bookworm/docker-entrypoint.sh
rename to haproxy_3.3-dev-trixie/docker-entrypoint.sh
diff --git a/haproxy_lts-bookworm/Dockerfile b/haproxy_lts-trixie/Dockerfile
similarity index 93%
rename from haproxy_lts-bookworm/Dockerfile
rename to haproxy_lts-trixie/Dockerfile
index ea69c5c..28e49ac 100644
--- a/haproxy_lts-bookworm/Dockerfile
+++ b/haproxy_lts-trixie/Dockerfile
@@ -4,16 +4,15 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# runtime dependencies
RUN set -eux; \
- apt-get update; \
- apt-get install -y --no-install-recommends \
+ apt-get install --update -y --no-install-recommends \
# @system-ca: https://github.com/docker-library/haproxy/pull/216
ca-certificates \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
# roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6
RUN set -eux; \
@@ -37,7 +36,7 @@ ENV HAPROXY_SHA256 af8ef64286bdddc93232c5dbe4ea436a8ccb5dc8417cfa1e885bec52884f9
RUN set -eux; \
\
savedAptMark="$(apt-mark showmanual)"; \
- apt-get update && apt-get install -y --no-install-recommends \
+ apt-get install --update -y --no-install-recommends \
gcc \
libc6-dev \
liblua5.4-dev \
@@ -46,7 +45,6 @@ RUN set -eux; \
make \
wget \
; \
- rm -rf /var/lib/apt/lists/*; \
\
wget -O haproxy.tar.gz "$HAPROXY_URL"; \
echo "$HAPROXY_SHA256 *haproxy.tar.gz" | sha256sum -c; \
@@ -87,6 +85,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
haproxy -v
diff --git a/haproxy_lts-bookworm/docker-entrypoint.sh b/haproxy_lts-trixie/docker-entrypoint.sh
similarity index 100%
rename from haproxy_lts-bookworm/docker-entrypoint.sh
rename to haproxy_lts-trixie/docker-entrypoint.shRelevant Maintainers: |
tianon
approved these changes
Aug 12, 2025
Member
tianon
left a comment
tianon
left a comment
There was a problem hiding this comment.
Hold till after the
debian:trixierelease image build.
Muscraft
pushed a commit
to Muscraft/official-images
that referenced
this pull request
Aug 19, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: