Skip to content

Commit 6d2a1b2

Browse files
authored
Merge pull request #1694 from Sneha-at/cve_fixes
Update debian image from bullseye to bookworm to fix CVEs
2 parents 34d0297 + 3bd8fd7 commit 6d2a1b2

File tree

1 file changed

+22
-8
lines changed

1 file changed

+22
-8
lines changed

Dockerfile

+22-8
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,15 @@ ADD . .
2222
RUN 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.5 as debian
25+
26+
FROM gke.gcr.io/debian-base:bookworm-v1.0.3-gke.0 as debian
27+
2628
# Install necessary dependencies
2729
# google_nvme_id script depends on the following packages: nvme-cli, xxd, bash
2830
RUN clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs nvme-cli xxd bash
2931

3032
# 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
3234

3335
# The distroless amd64 image has a target triplet of x86_64
3436
FROM distroless-base AS distroless-amd64
@@ -72,8 +74,7 @@ COPY --from=debian /bin/ln /bin/ln
7274
COPY --from=debian /bin/udevadm /bin/udevadm
7375

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

87101
COPY --from=debian /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libblkid.so.1 \
88102
/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 \
93107
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libacl.so.1 \
94108
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libattr.so.1 \
95109
/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 \
99113
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libkmod.so.2 \
100114
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libmd.so.0 \
101115
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libpcre2-8.so.0 \

0 commit comments

Comments
 (0)