diff --git a/2.4/Dockerfile b/2.4/Dockerfile index e862e01..f5ff1d4 100644 --- a/2.4/Dockerfile +++ b/2.4/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/2.6/Dockerfile b/2.6/Dockerfile index deeca8e..15051b2 100644 --- a/2.6/Dockerfile +++ b/2.6/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/2.8/Dockerfile b/2.8/Dockerfile index fb609c5..e312e31 100644 --- a/2.8/Dockerfile +++ b/2.8/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/3.0/Dockerfile b/3.0/Dockerfile index 13e90b8..6e6e819 100644 --- a/3.0/Dockerfile +++ b/3.0/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/3.1/Dockerfile b/3.1/Dockerfile index 900f9ea..8ef863c 100644 --- a/3.1/Dockerfile +++ b/3.1/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/3.2/Dockerfile b/3.2/Dockerfile index ea69c5c..28e49ac 100644 --- a/3.2/Dockerfile +++ b/3.2/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/3.3/Dockerfile b/3.3/Dockerfile index 3736191..fb7552c 100644 --- a/3.3/Dockerfile +++ b/3.3/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/Dockerfile.template b/Dockerfile.template index 1d705cc..1921add 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -27,12 +27,11 @@ FROM debian:{{ .debian }} # 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; \ @@ -84,7 +83,7 @@ RUN set -eux; \ ; \ {{ ) else ( -}} 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 \ liblua{{ lua }}-dev \ @@ -93,7 +92,6 @@ RUN set -eux; \ make \ wget \ ; \ - rm -rf /var/lib/apt/lists/*; \ {{ ) end -}} \ wget -O haproxy.tar.gz "$HAPROXY_URL"; \ @@ -158,6 +156,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + apt-get dist-clean; \ {{ ) end -}} \ # smoke test diff --git a/versions.json b/versions.json index 26ad113..ff2c872 100644 --- a/versions.json +++ b/versions.json @@ -1,49 +1,49 @@ { "2.4": { "alpine": "3.22", - "debian": "bookworm-slim", + "debian": "trixie-slim", "sha256": "89e1e675bfecc88624c19850fd6b69f7b91f112d61f30a3b20a625298ef1f3f3", "url": "https://www.haproxy.org/download/2.4/src/haproxy-2.4.29.tar.gz", "version": "2.4.29" }, "2.6": { "alpine": "3.22", - "debian": "bookworm-slim", + "debian": "trixie-slim", "sha256": "4c0797f450f997dc287d2c7aafa7a0e5b7a2d71593a2cd58e664e8f3aea614fa", "url": "https://www.haproxy.org/download/2.6/src/haproxy-2.6.22.tar.gz", "version": "2.6.22" }, "2.8": { "alpine": "3.22", - "debian": "bookworm-slim", + "debian": "trixie-slim", "sha256": "98f0551b9c3041a87869f4cd4e1465adf6fbef2056e83aabea92106032585242", "url": "https://www.haproxy.org/download/2.8/src/haproxy-2.8.15.tar.gz", "version": "2.8.15" }, "3.0": { "alpine": "3.22", - "debian": "bookworm-slim", + "debian": "trixie-slim", "sha256": "a133e2d550c5fd9a849b5c7ab17bb945bcdad209ca140d41f45ebf31943ae783", "url": "https://www.haproxy.org/download/3.0/src/haproxy-3.0.11.tar.gz", "version": "3.0.11" }, "3.1": { "alpine": "3.22", - "debian": "bookworm-slim", + "debian": "trixie-slim", "sha256": "6f249014b547d34fb41e19867746ec4da4ea7be0c0ce3b56f3cfde57ca3b212d", "url": "https://www.haproxy.org/download/3.1/src/haproxy-3.1.8.tar.gz", "version": "3.1.8" }, "3.2": { "alpine": "3.22", - "debian": "bookworm-slim", + "debian": "trixie-slim", "sha256": "af8ef64286bdddc93232c5dbe4ea436a8ccb5dc8417cfa1e885bec52884f9347", "url": "https://www.haproxy.org/download/3.2/src/haproxy-3.2.3.tar.gz", "version": "3.2.3" }, "3.3": { "alpine": "3.22", - "debian": "bookworm-slim", + "debian": "trixie-slim", "sha256": "35f1cd784f9af44f85bbc1e978a12422f5ab4e2d5d63df6aab96c47e2defbdee", "url": "https://www.haproxy.org/download/3.3/src/devel/haproxy-3.3-dev6.tar.gz", "version": "3.3-dev6" diff --git a/versions.sh b/versions.sh index c6c61bc..8a30ffc 100755 --- a/versions.sh +++ b/versions.sh @@ -12,7 +12,7 @@ else fi versions=( "${versions[@]%/}" ) -defaultDebianSuite='bookworm-slim' +defaultDebianSuite='trixie-slim' declare -A debianSuite=( ) defaultAlpineVersion='3.22'