From a3b479a33213bbeb9136072bf9f4167e7a629e22 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Fri, 3 Nov 2023 05:39:34 +0000 Subject: [PATCH] bookworm --- CHANGES.md | 2 +- Dockerfile-debug | 2 +- Dockerfile-proxy | 2 +- cni-plugin/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 8acfa187f7256..671bbff9d078c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1759,7 +1759,7 @@ it, such as recent versions of Flux. `linkerd-multicluster-link` chart for enhanced control on the service mirror deployment (thanks @utay!) * Fixed formatting of the `helm.sh/chart` label in CRDs -* Updated container base images from buster to bullseye +* Updated container base images from buster to bookworm * Added support for spaces in the `config.linkerd.io/opaque-ports` annotation ## edge-22.3.5 diff --git a/Dockerfile-debug b/Dockerfile-debug index 0a4d1db0c2c2a..e988fd9a4e51b 100644 --- a/Dockerfile-debug +++ b/Dockerfile-debug @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim +FROM debian:bookworm-slim RUN apt-get update && apt-get install -y --no-install-recommends \ curl \ dnsutils \ diff --git a/Dockerfile-proxy b/Dockerfile-proxy index 133a0a6416f02..90fe71af6577d 100644 --- a/Dockerfile-proxy +++ b/Dockerfile-proxy @@ -43,7 +43,7 @@ COPY --from=fetch /build/linkerd2-proxy /usr/lib/linkerd/linkerd2-proxy COPY --from=fetch /build/linkerd-await /usr/lib/linkerd/linkerd-await COPY --from=fetch /build/linkerd-network-validator /usr/lib/linkerd/linkerd2-network-validator COPY --from=golang /out/proxy-identity /usr/lib/linkerd/linkerd2-proxy-identity -COPY --from=debian:bullseye-slim /bin/sleep /bin/sleep +COPY --from=debian:bookworm-slim /bin/sleep /bin/sleep ARG LINKERD_VERSION ENV LINKERD_CONTAINER_VERSION_OVERRIDE=${LINKERD_VERSION} ENV LINKERD2_PROXY_LOG=warn,linkerd=info diff --git a/cni-plugin/Dockerfile b/cni-plugin/Dockerfile index 22aa5d063d69b..fe77e9357f56d 100644 --- a/cni-plugin/Dockerfile +++ b/cni-plugin/Dockerfile @@ -18,7 +18,7 @@ COPY cni-plugin cni-plugin ARG TARGETARCH RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build -o /go/bin/linkerd-cni -v -mod=readonly ./cni-plugin/ -FROM debian:bullseye-slim +FROM debian:bookworm-slim WORKDIR /linkerd RUN apt-get update && apt-get install -y --no-install-recommends \ iptables \