Skip to content

Commit 2ff3f8b

Browse files
committed
Update to Debian Trixie
1 parent 65c563d commit 2ff3f8b

File tree

10 files changed

+47
-55
lines changed

10 files changed

+47
-55
lines changed

2.4/Dockerfile

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

2.6/Dockerfile

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

2.8/Dockerfile

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.0/Dockerfile

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.1/Dockerfile

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.2/Dockerfile

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.3/Dockerfile

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile.template

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,11 @@ FROM debian:{{ .debian }}
2727

2828
# runtime dependencies
2929
RUN set -eux; \
30-
apt-get update; \
31-
apt-get install -y --no-install-recommends \
30+
apt-get install --update -y --no-install-recommends \
3231
# @system-ca: https://github.com/docker-library/haproxy/pull/216
3332
ca-certificates \
3433
; \
35-
rm -rf /var/lib/apt/lists/*
34+
apt-get dist-clean
3635

3736
# roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6
3837
RUN set -eux; \
@@ -84,7 +83,7 @@ RUN set -eux; \
8483
; \
8584
{{ ) else ( -}}
8685
savedAptMark="$(apt-mark showmanual)"; \
87-
apt-get update && apt-get install -y --no-install-recommends \
86+
apt-get install --update -y --no-install-recommends \
8887
gcc \
8988
libc6-dev \
9089
liblua{{ lua }}-dev \
@@ -93,7 +92,6 @@ RUN set -eux; \
9392
make \
9493
wget \
9594
; \
96-
rm -rf /var/lib/apt/lists/*; \
9795
{{ ) end -}}
9896
\
9997
wget -O haproxy.tar.gz "$HAPROXY_URL"; \
@@ -158,6 +156,7 @@ RUN set -eux; \
158156
| xargs -r apt-mark manual \
159157
; \
160158
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
159+
apt-get dist-clean; \
161160
{{ ) end -}}
162161
\
163162
# smoke test

0 commit comments

Comments
 (0)