@@ -23,14 +23,14 @@ RUN GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GCE_PD_CSI_STAGING_VERSION=$
23
23
24
24
# Start from Kubernetes Debian base.
25
25
26
- FROM gke.gcr.io/debian-base:bookworm -v1.0 .3-gke.0 as debian
26
+ FROM gke.gcr.io/debian-base:bullseye -v1.4 .3-gke.5 as debian
27
27
28
28
# Install necessary dependencies
29
29
# google_nvme_id script depends on the following packages: nvme-cli, xxd, bash
30
30
RUN clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs nvme-cli xxd bash
31
31
32
32
# Since we're leveraging apt to pull in dependencies, we use `gcr.io/distroless/base` because it includes glibc.
33
- FROM gcr.io/distroless/base-debian12 as distroless-base
33
+ FROM gcr.io/distroless/base-debian11 as distroless-base
34
34
35
35
# The distroless amd64 image has a target triplet of x86_64
36
36
FROM distroless-base AS distroless-amd64
@@ -74,7 +74,8 @@ COPY --from=debian /bin/ln /bin/ln
74
74
COPY --from=debian /bin/udevadm /bin/udevadm
75
75
76
76
# Copy shared libraries into distroless base.
77
- COPY --from=debian /lib/${LIB_DIR_PREFIX}-linux-gnu/libselinux.so.1 \
77
+ COPY --from=debian /lib/${LIB_DIR_PREFIX}-linux-gnu/libpcre.so.3 \
78
+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libselinux.so.1 \
78
79
/lib/${LIB_DIR_PREFIX}-linux-gnu/libtinfo.so.6 \
79
80
/lib/${LIB_DIR_PREFIX}-linux-gnu/libe2p.so.2 \
80
81
/lib/${LIB_DIR_PREFIX}-linux-gnu/libcom_err.so.2 \
@@ -83,20 +84,7 @@ COPY --from=debian /lib/${LIB_DIR_PREFIX}-linux-gnu/libselinux.so.1 \
83
84
/lib/${LIB_DIR_PREFIX}-linux-gnu/libgcc_s.so.1 \
84
85
/lib/${LIB_DIR_PREFIX}-linux-gnu/liblzma.so.5 \
85
86
/lib/${LIB_DIR_PREFIX}-linux-gnu/libreadline.so.8 \
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/
87
+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libz.so.1 /lib/${LIB_DIR_PREFIX}-linux-gnu/
100
88
101
89
COPY --from=debian /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libblkid.so.1 \
102
90
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libbsd.so.0 \
@@ -107,9 +95,9 @@ COPY --from=debian /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libblkid.so.1 \
107
95
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libacl.so.1 \
108
96
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libattr.so.1 \
109
97
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libedit.so.2 \
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 \
98
+ /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicudata.so.67 \
99
+ /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicui18n.so.67 \
100
+ /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicuuc.so.67 \
113
101
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libkmod.so.2 \
114
102
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libmd.so.0 \
115
103
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libpcre2-8.so.0 \
0 commit comments