@@ -22,13 +22,15 @@ ADD . .
22
22
RUN GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/' ) GCE_PD_CSI_STAGING_VERSION=$STAGINGVERSION make gce-pd-driver
23
23
24
24
# Start from Kubernetes Debian base.
25
- FROM gke.gcr.io/debian-base:bullseye-v1.4.3-gke.5 as debian
25
+
26
+ FROM gke.gcr.io/debian-base:bookworm-v1.0.3-gke.0 as debian
27
+
26
28
# Install necessary dependencies
27
29
# google_nvme_id script depends on the following packages: nvme-cli, xxd, bash
28
30
RUN clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs nvme-cli xxd bash
29
31
30
32
# 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
33
+ FROM gcr.io/distroless/base-debian12 as distroless-base
32
34
33
35
# The distroless amd64 image has a target triplet of x86_64
34
36
FROM distroless-base AS distroless-amd64
@@ -72,8 +74,7 @@ COPY --from=debian /bin/ln /bin/ln
72
74
COPY --from=debian /bin/udevadm /bin/udevadm
73
75
74
76
# 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 \
77
+ COPY --from=debian /lib/${LIB_DIR_PREFIX}-linux-gnu/libselinux.so.1 \
77
78
/lib/${LIB_DIR_PREFIX}-linux-gnu/libtinfo.so.6 \
78
79
/lib/${LIB_DIR_PREFIX}-linux-gnu/libe2p.so.2 \
79
80
/lib/${LIB_DIR_PREFIX}-linux-gnu/libcom_err.so.2 \
@@ -82,7 +83,20 @@ COPY --from=debian /lib/${LIB_DIR_PREFIX}-linux-gnu/libpcre.so.3 \
82
83
/lib/${LIB_DIR_PREFIX}-linux-gnu/libgcc_s.so.1 \
83
84
/lib/${LIB_DIR_PREFIX}-linux-gnu/liblzma.so.5 \
84
85
/lib/${LIB_DIR_PREFIX}-linux-gnu/libreadline.so.8 \
85
- /lib/${LIB_DIR_PREFIX}-linux-gnu/libz.so.1 /lib/${LIB_DIR_PREFIX}-linux-gnu/
86
+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libz.so.1 \
87
+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libc.so.6 \
88
+ /lib/${LIB_DIR_PREFIX}-linux-gnu/liburcu.so.8 \
89
+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libcap.so.2 \
90
+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libcrypto.so.3 \
91
+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libdbus-1.so.3 \
92
+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libgcrypt.so.20 \
93
+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libjson-c.so.5 \
94
+ /lib/${LIB_DIR_PREFIX}-linux-gnu/liblz4.so.1 \
95
+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libm.so.6 \
96
+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libnvme-mi.so.1 \
97
+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libnvme.so.1 \
98
+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libsystemd.so.0 \
99
+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libzstd.so.1 /lib/${LIB_DIR_PREFIX}-linux-gnu/
86
100
87
101
COPY --from=debian /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libblkid.so.1 \
88
102
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libbsd.so.0 \
@@ -93,9 +107,9 @@ COPY --from=debian /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libblkid.so.1 \
93
107
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libacl.so.1 \
94
108
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libattr.so.1 \
95
109
/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 \
110
+ /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicudata.so.72 \
111
+ /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicui18n.so.72 \
112
+ /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicuuc.so.72 \
99
113
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libkmod.so.2 \
100
114
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libmd.so.0 \
101
115
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libpcre2-8.so.0 \
0 commit comments