@@ -24,7 +24,7 @@ ADD . .
24
24
RUN GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/' ) GCE_PD_CSI_STAGING_VERSION=$STAGINGVERSION make gce-pd-driver
25
25
26
26
# Start from Kubernetes Debian base.
27
- FROM k8s .gcr.io/build-image/ debian-base:buster -v1.9 .0 as debian
27
+ FROM gke .gcr.io/debian-base:bullseye -v1.4.3-gke .0 as debian
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
@@ -74,28 +74,30 @@ 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/libblkid.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 \
79
+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libtinfo.so.6 \
80
+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libe2p.so.2 \
78
81
/lib/${LIB_DIR_PREFIX}-linux-gnu/libcom_err.so.2 \
79
82
/lib/${LIB_DIR_PREFIX}-linux-gnu/libdevmapper.so.1.02.1 \
80
- /lib/${LIB_DIR_PREFIX}-linux-gnu/libe2p.so.2 \
81
83
/lib/${LIB_DIR_PREFIX}-linux-gnu/libext2fs.so.2 \
82
84
/lib/${LIB_DIR_PREFIX}-linux-gnu/libgcc_s.so.1 \
83
85
/lib/${LIB_DIR_PREFIX}-linux-gnu/liblzma.so.5 \
84
- /lib/${LIB_DIR_PREFIX}-linux-gnu/libmount.so.1 \
85
- /lib/${LIB_DIR_PREFIX}-linux-gnu/libpcre.so.3 \
86
- /lib/${LIB_DIR_PREFIX}-linux-gnu/libreadline.so.5 \
87
- /lib/${LIB_DIR_PREFIX}-linux-gnu/libselinux.so.1 \
88
- /lib/${LIB_DIR_PREFIX}-linux-gnu/libtinfo.so.6 \
89
- /lib/${LIB_DIR_PREFIX}-linux-gnu/libudev.so.1 \
90
- /lib/${LIB_DIR_PREFIX}-linux-gnu/libuuid.so.1 \
86
+ /lib/${LIB_DIR_PREFIX}-linux-gnu/libreadline.so.8 \
91
87
/lib/${LIB_DIR_PREFIX}-linux-gnu/libz.so.1 /lib/${LIB_DIR_PREFIX}-linux-gnu/
92
88
93
- COPY --from=debian /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libacl.so.1 \
89
+ COPY --from=debian /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libblkid.so.1 \
90
+ /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libinih.so.1 \
91
+ /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libmount.so.1 \
92
+ /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libudev.so.1 \
93
+ /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libuuid.so.1 \
94
+ /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libacl.so.1 \
94
95
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libattr.so.1 \
95
- /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicudata.so.63 \
96
- /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicui18n.so.63 \
97
- /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicuuc.so.63 \
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 \
98
99
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libkmod.so.2 \
100
+ /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libpcre2-8.so.0 \
99
101
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libstdc++.so.6 /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/
100
102
101
103
# Copy NVME support required script and rules into distroless base.
0 commit comments