Skip to content

Commit 2ee2693

Browse files
Bump image from bullseye to bookworm for local-path-helper,local-path-provisioner
1 parent 9e6df7d commit 2ee2693

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

images/local-path-helper/Dockerfile

Lines changed: 2 additions & 2 deletions
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.5"
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-helper/stage-binary-and-deps.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ file_to_package() {
3030
# `dpkg-query --search $file-pattern` outputs lines with the format: "$package: $file-path"
3131
# where $file-path belongs to $package
3232
# https://manpages.debian.org/jessie/dpkg/dpkg-query.1.en.html
33-
dpkg-query --search "$(realpath "${1}")" | cut -d':' -f1
33+
# Match bash path in dpkg regardless of /usr merge
34+
dpkg-query --search "$(realpath "${1}" | sed 's|/usr|*|')" | cut -d':' -f1
3435
}
3536

3637
# package_to_copyright gives the path to the copyright file for the package $1

images/local-path-provisioner/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ RUN eval "$(gimme "${GO_VERSION}")" \
2929
&& GOBIN=/usr/local/bin go install github.com/google/go-licenses@latest \
3030
&& GOARCH=$TARGETARCH go-licenses save --save_path=/_LICENSES .
3131

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

0 commit comments

Comments
 (0)