Skip to content

Commit 9fb13b2

Browse files
committed
Update logic to fetch dependencies
1 parent 4d94913 commit 9fb13b2

File tree

1 file changed

+2
-67
lines changed

1 file changed

+2
-67
lines changed

Dockerfile

+2-67
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ WORKDIR /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
2121
ADD . .
2222
RUN GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GCE_PD_CSI_STAGING_VERSION=$STAGINGVERSION make gce-pd-driver
2323

24-
# # Start from Kubernetes Debian base.
25-
# FROM gke.gcr.io/debian-base:bookworm-v1.0.2-gke.1 as debian
26-
# # Install necessary dependencies
27-
# # google_nvme_id script depends on the following packages: nvme-cli, xxd, bash
28-
# RUN clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs nvme-cli xxd bash
29-
3024
FROM gke.gcr.io/debian-base:bookworm-v1.0.2-gke.2@sha256:1e4d9fa20ba4b3372f2c2f8676823f25c63e1ba7c09ed17933a19b054b97b795 AS debian
3125
ARG PKGS="util-linux e2fsprogs mount ca-certificates udev xfsprogs nvme-cli xxd bash"
3226
RUN cd /tmp \
@@ -54,71 +48,12 @@ ENV LIB_DIR_PREFIX aarch64
5448

5549
FROM distroless-$TARGETARCH as output-image
5650

57-
5851
# Update the bas image for debian
5952
COPY --from=debian ["/dpkg/", "/"]
6053

6154

62-
# # Copy necessary dependencies into distroless base.
63-
# COPY --from=builder /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/bin/gce-pd-csi-driver /gce-pd-csi-driver
64-
# COPY --from=debian /etc/mke2fs.conf /etc/mke2fs.conf
65-
# COPY --from=debian /lib/udev/scsi_id /lib/udev_containerized/scsi_id
66-
# COPY --from=debian /bin/mount /bin/mount
67-
# COPY --from=debian /bin/umount /bin/umount
68-
# COPY --from=debian /sbin/blkid /sbin/blkid
69-
# COPY --from=debian /sbin/blockdev /sbin/blockdev
70-
# COPY --from=debian /sbin/dumpe2fs /sbin/dumpe2fs
71-
# COPY --from=debian /sbin/e* /sbin/
72-
# COPY --from=debian /sbin/e2fsck /sbin/e2fsck
73-
# COPY --from=debian /sbin/fsck /sbin/fsck
74-
# COPY --from=debian /sbin/fsck* /sbin/
75-
# COPY --from=debian /sbin/fsck.xfs /sbin/fsck.xfs
76-
# COPY --from=debian /sbin/mke2fs /sbin/mke2fs
77-
# COPY --from=debian /sbin/mkfs* /sbin/
78-
# COPY --from=debian /sbin/resize2fs /sbin/resize2fs
79-
# COPY --from=debian /sbin/xfs_repair /sbin/xfs_repair
80-
# COPY --from=debian /usr/include/xfs /usr/include/xfs
81-
# COPY --from=debian /usr/lib/xfsprogs/xfs* /usr/lib/xfsprogs/
82-
# COPY --from=debian /usr/sbin/xfs* /usr/sbin/
83-
# # Add dependencies for /lib/udev_containerized/google_nvme_id script
84-
# COPY --from=debian /usr/sbin/nvme /usr/sbin/nvme
85-
# COPY --from=debian /usr/bin/xxd /usr/bin/xxd
86-
# COPY --from=debian /bin/bash /bin/bash
87-
# COPY --from=debian /bin/date /bin/date
88-
# COPY --from=debian /bin/grep /bin/grep
89-
# COPY --from=debian /bin/sed /bin/sed
90-
# COPY --from=debian /bin/ln /bin/ln
91-
# COPY --from=debian /bin/udevadm /bin/udevadm
92-
93-
# # Copy shared libraries into distroless base.
94-
# COPY --from=debian /lib/${LIB_DIR_PREFIX}-linux-gnu/libpcre.so.3 \
95-
# /lib/${LIB_DIR_PREFIX}-linux-gnu/libselinux.so.1 \
96-
# /lib/${LIB_DIR_PREFIX}-linux-gnu/libtinfo.so.6 \
97-
# /lib/${LIB_DIR_PREFIX}-linux-gnu/libe2p.so.2 \
98-
# /lib/${LIB_DIR_PREFIX}-linux-gnu/libcom_err.so.2 \
99-
# /lib/${LIB_DIR_PREFIX}-linux-gnu/libdevmapper.so.1.02.1 \
100-
# /lib/${LIB_DIR_PREFIX}-linux-gnu/libext2fs.so.2 \
101-
# /lib/${LIB_DIR_PREFIX}-linux-gnu/libgcc_s.so.1 \
102-
# /lib/${LIB_DIR_PREFIX}-linux-gnu/liblzma.so.5 \
103-
# /lib/${LIB_DIR_PREFIX}-linux-gnu/libreadline.so.8 \
104-
# /lib/${LIB_DIR_PREFIX}-linux-gnu/libz.so.1 /lib/${LIB_DIR_PREFIX}-linux-gnu/
105-
106-
# COPY --from=debian /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libblkid.so.1 \
107-
# /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libbsd.so.0 \
108-
# /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libinih.so.1 \
109-
# /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libmount.so.1 \
110-
# /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libudev.so.1 \
111-
# /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libuuid.so.1 \
112-
# /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libacl.so.1 \
113-
# /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libattr.so.1 \
114-
# /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libedit.so.2 \
115-
# /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicudata.so.67 \
116-
# /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicui18n.so.67 \
117-
# /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicuuc.so.67 \
118-
# /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libkmod.so.2 \
119-
# /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libmd.so.0 \
120-
# /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libpcre2-8.so.0 \
121-
# /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libstdc++.so.6 /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/
55+
# Copy necessary dependencies into distroless base.
56+
COPY --from=builder /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/bin/gce-pd-csi-driver /gce-pd-csi-driver
12257

12358
# Copy NVME support required script and rules into distroless base.
12459
COPY deploy/kubernetes/udev/google_nvme_id /lib/udev_containerized/google_nvme_id

0 commit comments

Comments
 (0)