Skip to content

Commit a7c62c4

Browse files
authored
Merge pull request #3294 from saschagrunert/bookworm
Switch to debian bookworm as base image
2 parents cc52fab + 7dc7aad commit a7c62c4

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

images/base/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# start from debian slim, this image is reasonably small as a starting point
2121
# for a kubernetes node image, it doesn't contain much (anything?) we don't need
2222
# this stage will install basic files and packages
23-
ARG BASE_IMAGE=debian:bullseye-slim
23+
ARG BASE_IMAGE=debian:bookworm-slim
2424
FROM $BASE_IMAGE as base
2525

2626
# copy in static files

images/haproxy/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# This image is a haproxy image + minimal config so the container will not exit
1616
# while we rewrite the config at runtime and signal haproxy to reload.
1717

18-
ARG BASE="registry.k8s.io/build-image/debian-base:bullseye-v1.4.3"
18+
ARG BASE="registry.k8s.io/build-image/debian-base:bookworm-v1.0.0"
1919
FROM ${BASE} as build
2020

2121
# NOTE: copyrights.tar.gz is a quirk of Kubernetes's debian-base image
@@ -50,7 +50,7 @@ RUN mkdir -p "${STAGE_DIR}" && \
5050

5151
# See: https://github.com/GoogleContainerTools/distroless/tree/main/base
5252
# This has /etc/passwd, tzdata, cacerts
53-
FROM "gcr.io/distroless/static-debian11"
53+
FROM "gcr.io/distroless/static-debian12"
5454

5555
ARG STAGE_DIR="/opt/stage"
5656

images/local-path-helper/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# This image is contains the binaries needed for the local-path-provisioner
1616
# helper pod. Currently that means: sh, rm, mkdir
1717

18-
ARG BASE="registry.k8s.io/build-image/debian-base:bullseye-v1.4.3"
18+
ARG BASE="registry.k8s.io/build-image/debian-base:bookworm-v1.0.0"
1919
FROM ${BASE} as build
2020

2121
# NOTE: copyrights.tar.gz is a quirk of Kubernetes's debian-base image
@@ -42,6 +42,6 @@ RUN mkdir -p "${STAGE_DIR}" && \
4242
find "${STAGE_DIR}"
4343

4444
# copy staged binary + deps + copyright into distroless
45-
FROM "gcr.io/distroless/static-debian11"
45+
FROM "gcr.io/distroless/static-debian12"
4646
ARG STAGE_DIR="/opt/stage"
4747
COPY --from=build "${STAGE_DIR}/" /

images/local-path-provisioner/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN eval "$(gimme "${GO_VERSION}")" \
2727
&& GOBIN=/usr/local/bin go install github.com/google/go-licenses@latest \
2828
&& GOARCH=$TARGETARCH go-licenses save --save_path=/_LICENSES .
2929

30-
FROM gcr.io/distroless/base-debian11
30+
FROM gcr.io/distroless/base-debian12
3131
COPY --from=0 /usr/local/bin/local-path-provisioner /usr/local/bin/local-path-provisioner
3232
COPY --from=0 /_LICENSES/* /LICENSES/
3333
COPY --chmod=0644 files/LICENSES/* /LICENSES/*

0 commit comments

Comments
 (0)