Skip to content

Commit 42e86ee

Browse files
committed
1 parent 5362aab commit 42e86ee

File tree

1 file changed

+8
-20
lines changed

1 file changed

+8
-20
lines changed

Dockerfile

+8-20
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ RUN GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GCE_PD_CSI_STAGING_VERSION=$
2323

2424
# Start from Kubernetes Debian base.
2525

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
2727

2828
# Install necessary dependencies
2929
# google_nvme_id script depends on the following packages: nvme-cli, xxd, bash
3030
RUN clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs nvme-cli xxd bash
3131

3232
# 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
3434

3535
# The distroless amd64 image has a target triplet of x86_64
3636
FROM distroless-base AS distroless-amd64
@@ -74,7 +74,8 @@ COPY --from=debian /bin/ln /bin/ln
7474
COPY --from=debian /bin/udevadm /bin/udevadm
7575

7676
# 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 \
7879
/lib/${LIB_DIR_PREFIX}-linux-gnu/libtinfo.so.6 \
7980
/lib/${LIB_DIR_PREFIX}-linux-gnu/libe2p.so.2 \
8081
/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 \
8384
/lib/${LIB_DIR_PREFIX}-linux-gnu/libgcc_s.so.1 \
8485
/lib/${LIB_DIR_PREFIX}-linux-gnu/liblzma.so.5 \
8586
/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/
10088

10189
COPY --from=debian /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libblkid.so.1 \
10290
/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 \
10795
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libacl.so.1 \
10896
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libattr.so.1 \
10997
/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 \
113101
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libkmod.so.2 \
114102
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libmd.so.0 \
115103
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libpcre2-8.so.0 \

0 commit comments

Comments
 (0)