File tree Expand file tree Collapse file tree 3 files changed +5
-4
lines changed Expand file tree Collapse file tree 3 files changed +5
-4
lines changed Original file line number Diff line number Diff line change 15
15
# This image is contains the binaries needed for the local-path-provisioner
16
16
# helper pod. Currently that means: sh, rm, mkdir
17
17
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 "
19
19
FROM ${BASE} AS build
20
20
21
21
# NOTE: copyrights.tar.gz is a quirk of Kubernetes's debian-base image
@@ -42,6 +42,6 @@ RUN mkdir -p "${STAGE_DIR}" && \
42
42
find "${STAGE_DIR}"
43
43
44
44
# copy staged binary + deps + copyright into distroless
45
- FROM "gcr.io/distroless/static-debian11 "
45
+ FROM "gcr.io/distroless/static-debian12 "
46
46
ARG STAGE_DIR="/opt/stage"
47
47
COPY --from=build "${STAGE_DIR}/" /
Original file line number Diff line number Diff line change @@ -30,7 +30,8 @@ file_to_package() {
30
30
# `dpkg-query --search $file-pattern` outputs lines with the format: "$package: $file-path"
31
31
# where $file-path belongs to $package
32
32
# 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
34
35
}
35
36
36
37
# package_to_copyright gives the path to the copyright file for the package $1
Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ RUN eval "$(gimme "${GO_VERSION}")" \
29
29
&& GOBIN=/usr/local/bin go install github.com/google/go-licenses@latest \
30
30
&& GOARCH=$TARGETARCH go-licenses save --save_path=/_LICENSES .
31
31
32
- FROM gcr.io/distroless/base-debian11
32
+ FROM gcr.io/distroless/base-debian12
33
33
COPY --from=0 /usr/local/bin/local-path-provisioner /usr/local/bin/local-path-provisioner
34
34
COPY --from=0 /_LICENSES/* /LICENSES/
35
35
COPY --chmod=0644 files/LICENSES/* /LICENSES/*
You can’t perform that action at this time.
0 commit comments