File tree Expand file tree Collapse file tree 2 files changed +4
-3
lines changed
Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change 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 .3"
1919FROM ${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 "
4646ARG STAGE_DIR="/opt/stage"
4747COPY --from=build "${STAGE_DIR}/" /
Original file line number Diff line number Diff 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
You can’t perform that action at this time.
0 commit comments