@@ -22,13 +22,13 @@ ADD . .
2222RUN GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/' ) GCE_PD_CSI_STAGING_VERSION=$STAGINGVERSION make gce-pd-driver
2323
2424# Start from Kubernetes Debian base.
25- FROM gke.gcr.io/debian-base:bullseye -v1.4.3 -gke.13 as debian
25+ FROM gke.gcr.io/debian-base:bookworm -v1.0.4 -gke.3 AS debian
2626# Install necessary dependencies
2727# google_nvme_id script depends on the following packages: nvme-cli, xxd, bash
2828RUN clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs nvme-cli xxd bash
2929
3030# Since we're leveraging apt to pull in dependencies, we use `gcr.io/distroless/base` because it includes glibc.
31- FROM gcr.io/distroless/base-debian11 as distroless-base
31+ FROM gcr.io/distroless/base-debian12 as distroless-base
3232
3333# The distroless amd64 image has a target triplet of x86_64
3434FROM distroless-base AS distroless-amd64
@@ -72,8 +72,7 @@ COPY --from=debian /bin/ln /bin/ln
7272COPY --from=debian /bin/udevadm /bin/udevadm
7373
7474# Copy shared libraries into distroless base.
75- COPY --from=debian /lib/${LIB_DIR_PREFIX}-linux-gnu/libpcre.so.3 \
76- /lib/${LIB_DIR_PREFIX}-linux-gnu/libselinux.so.1 \
75+ COPY --from=debian /lib/${LIB_DIR_PREFIX}-linux-gnu/libselinux.so.1 \
7776 /lib/${LIB_DIR_PREFIX}-linux-gnu/libtinfo.so.6 \
7877 /lib/${LIB_DIR_PREFIX}-linux-gnu/libe2p.so.2 \
7978 /lib/${LIB_DIR_PREFIX}-linux-gnu/libcom_err.so.2 \
@@ -82,6 +81,19 @@ COPY --from=debian /lib/${LIB_DIR_PREFIX}-linux-gnu/libpcre.so.3 \
8281 /lib/${LIB_DIR_PREFIX}-linux-gnu/libgcc_s.so.1 \
8382 /lib/${LIB_DIR_PREFIX}-linux-gnu/liblzma.so.5 \
8483 /lib/${LIB_DIR_PREFIX}-linux-gnu/libreadline.so.8 \
84+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libz.so.1 \
85+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libc.so.6 \
86+ /lib/${LIB_DIR_PREFIX}-linux-gnu/liburcu.so.8 \
87+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libcap.so.2 \
88+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libcrypto.so.3 \
89+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libdbus-1.so.3 \
90+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libgcrypt.so.20 \
91+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libjson-c.so.5 \
92+ /lib/${LIB_DIR_PREFIX}-linux-gnu/liblz4.so.1 \
93+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libm.so.6 \
94+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libnvme-mi.so.1 \
95+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libnvme.so.1 \
96+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libsystemd.so.0 \
8597 /lib/${LIB_DIR_PREFIX}-linux-gnu/libz.so.1 /lib/${LIB_DIR_PREFIX}-linux-gnu/
8698
8799COPY --from=debian /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libblkid.so.1 \
@@ -93,9 +105,9 @@ COPY --from=debian /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libblkid.so.1 \
93105 /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libacl.so.1 \
94106 /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libattr.so.1 \
95107 /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libedit.so.2 \
96- /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicudata.so.67 \
97- /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicui18n.so.67 \
98- /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicuuc.so.67 \
108+ /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicudata.so.72 \
109+ /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicui18n.so.72 \
110+ /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicuuc.so.72 \
99111 /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libkmod.so.2 \
100112 /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libmd.so.0 \
101113 /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libpcre2-8.so.0 \
0 commit comments