Skip to content

Commit f87db22

Browse files
dockerfile: update to Debian Trixie
Signed-off-by: Patrick Stephens <pat@fluent.do>
1 parent 912b7d7 commit f87db22

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

dockerfiles/Dockerfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ARG RELEASE_VERSION=4.1.1
1919
FROM multiarch/qemu-user-static:x86_64-arm AS qemu-arm32
2020
FROM multiarch/qemu-user-static:x86_64-aarch64 AS qemu-arm64
2121

22-
FROM debian:bookworm-slim AS builder-base
22+
FROM debian:trixie-slim AS builder-base
2323

2424
COPY --from=qemu-arm32 /usr/bin/qemu-arm-static /usr/bin/
2525
COPY --from=qemu-arm64 /usr/bin/qemu-aarch64-static /usr/bin/
@@ -35,7 +35,7 @@ RUN mkdir -p /fluent-bit/bin /fluent-bit/etc /fluent-bit/log
3535
ENV DEBIAN_FRONTEND=noninteractive
3636

3737
# hadolint ignore=DL3008
38-
RUN echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/sources.list && \
38+
RUN echo "deb http://deb.debian.org/debian trixie-backports main" >> /etc/apt/sources.list && \
3939
apt-get update && \
4040
apt-get install -y --no-install-recommends \
4141
build-essential \
@@ -48,7 +48,7 @@ RUN echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/
4848
libcurl4-openssl-dev \
4949
libsasl2-dev \
5050
pkg-config \
51-
libsystemd-dev/bookworm-backports \
51+
libsystemd-dev/trixie-backports \
5252
zlib1g-dev \
5353
libpq-dev \
5454
postgresql-server-dev-all \
@@ -114,15 +114,15 @@ RUN /fluent-bit/bin/fluent-bit -J > /fluent-bit/etc/schema.json
114114

115115
# Simple example of how to properly extract packages for reuse in distroless
116116
# Taken from: https://github.com/GoogleContainerTools/distroless/issues/863
117-
FROM debian:bookworm-slim AS deb-extractor
117+
FROM debian:trixie-slim AS deb-extractor
118118
COPY --from=qemu-arm32 /usr/bin/qemu-arm-static /usr/bin/
119119
COPY --from=qemu-arm64 /usr/bin/qemu-aarch64-static /usr/bin/
120120

121121
# We download all debs locally then extract them into a directory we can use as the root for distroless.
122122
# We also include some extra handling for the status files that some tooling uses for scanning, etc.
123123
WORKDIR /tmp
124124
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
125-
RUN echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/sources.list && \
125+
RUN echo "deb http://deb.debian.org/debian trixie-backports main" >> /etc/apt/sources.list && \
126126
apt-get update && \
127127
apt-get download \
128128
libssl3 \
@@ -135,7 +135,7 @@ RUN echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/
135135
libsasl2-2 \
136136
pkg-config \
137137
libpq5 \
138-
libsystemd0/bookworm-backports \
138+
libsystemd0/trixie-backports \
139139
zlib1g \
140140
ca-certificates \
141141
libatomic1 \
@@ -177,7 +177,7 @@ RUN find /dpkg/ -type d -empty -delete && \
177177

178178
# We want latest at time of build
179179
# hadolint ignore=DL3006
180-
FROM gcr.io/distroless/cc-debian12 AS production
180+
FROM gcr.io/distroless/cc-debian13 AS production
181181
ARG RELEASE_VERSION
182182
ENV FLUENT_BIT_VERSION=${RELEASE_VERSION}
183183
LABEL description="Fluent Bit multi-architecture container image" \
@@ -208,7 +208,7 @@ EXPOSE 2020
208208
ENTRYPOINT [ "/fluent-bit/bin/fluent-bit" ]
209209
CMD ["/fluent-bit/bin/fluent-bit", "-c", "/fluent-bit/etc/fluent-bit.conf"]
210210

211-
FROM debian:bookworm-slim AS debug
211+
FROM debian:trixie-slim AS debug
212212
ARG RELEASE_VERSION
213213
ENV FLUENT_BIT_VERSION=${RELEASE_VERSION}
214214
LABEL description="Fluent Bit multi-architecture debug container image" \
@@ -229,7 +229,7 @@ COPY --from=qemu-arm64 /usr/bin/qemu-aarch64-static /usr/bin/
229229
ENV DEBIAN_FRONTEND=noninteractive
230230

231231
# hadolint ignore=DL3008
232-
RUN echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/sources.list && \
232+
RUN echo "deb http://deb.debian.org/debian trixie-backports main" >> /etc/apt/sources.list && \
233233
apt-get update && \
234234
apt-get install -y --no-install-recommends \
235235
libssl3 \
@@ -242,7 +242,7 @@ RUN echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/
242242
libsasl2-2 \
243243
pkg-config \
244244
libpq5 \
245-
libsystemd0/bookworm-backports \
245+
libsystemd0/trixie-backports \
246246
zlib1g \
247247
ca-certificates \
248248
libatomic1 \
@@ -256,7 +256,7 @@ RUN echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/
256256
openssl \
257257
htop atop strace iotop sysstat ncdu logrotate hdparm pciutils psmisc tree pv \
258258
make tar flex bison \
259-
libssl-dev libsasl2-dev libsystemd-dev/bookworm-backports zlib1g-dev libpq-dev libyaml-dev postgresql-server-dev-all \
259+
libssl-dev libsasl2-dev libsystemd-dev/trixie-backports zlib1g-dev libpq-dev libyaml-dev postgresql-server-dev-all \
260260
&& apt-get satisfy -y cmake "cmake (<< 4.0)" \
261261
&& apt-get clean \
262262
&& rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)