Skip to content

Commit 8d18b9a

Browse files
committed
change Dockerfile.arm to use debian base image
1 parent 4d99e06 commit 8d18b9a

File tree

1 file changed

+8
-25
lines changed

1 file changed

+8
-25
lines changed

Dockerfile.arm64

+8-25
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,15 @@ WORKDIR /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
2323
ADD . .
2424
RUN GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GCE_PD_CSI_STAGING_VERSION=$STAGINGVERSION make gce-pd-driver
2525

26-
# Start from Kubernetes Debian base.
27-
FROM k8s.gcr.io/build-image/debian-base:buster-v1.9.0 as debian
26+
# MAD HACKS: Build a version first so we can take the scsi_id bin and put it somewhere else in our real build
27+
FROM k8s.gcr.io/build-image/debian-base:buster-v1.9.0 as mad-hack
28+
RUN clean-install udev
29+
30+
# Start from Kubernetes Debian base
31+
FROM k8s.gcr.io/build-image/debian-base:buster-v1.9.0
32+
COPY --from=builder /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/bin/gce-pd-csi-driver /gce-pd-csi-driver
2833
# Install necessary dependencies
2934
RUN clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs
30-
# 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
32-
# Copy necessary dependencies into distroless base.
33-
COPY --from=builder /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/bin/gce-pd-csi-driver /gce-pd-csi-driver
34-
COPY --from=debian /etc/mke2fs.conf /etc/mke2fs.conf
35-
COPY --from=debian /lib/udev/scsi_id /lib/udev_containerized/scsi_id
36-
COPY --from=debian /bin/mount /bin/mount
37-
COPY --from=debian /bin/umount /bin/umount
38-
COPY --from=debian /sbin/blkid /sbin/blkid
39-
COPY --from=debian /sbin/blockdev /sbin/blockdev
40-
COPY --from=debian /sbin/dumpe2fs /sbin/dumpe2fs
41-
COPY --from=debian /sbin/e* /sbin/
42-
COPY --from=debian /sbin/e2fsck /sbin/e2fsck
43-
COPY --from=debian /sbin/fsck /sbin/fsck
44-
COPY --from=debian /sbin/fsck* /sbin/
45-
COPY --from=debian /sbin/fsck.xfs /sbin/fsck.xfs
46-
COPY --from=debian /sbin/mke2fs /sbin/mke2fs
47-
COPY --from=debian /sbin/mkfs* /sbin/
48-
COPY --from=debian /sbin/resize2fs /sbin/resize2fs
49-
COPY --from=debian /sbin/xfs_repair /sbin/xfs_repair
50-
COPY --from=debian /usr/include/xfs /usr/include/xfs
51-
COPY --from=debian /usr/lib/xfsprogs/xfs* /usr/lib/xfsprogs/
52-
COPY --from=debian /usr/sbin/xfs* /usr/sbin/
35+
COPY --from=mad-hack /lib/udev/scsi_id /lib/udev_containerized/scsi_id
5336

5437
ENTRYPOINT ["/gce-pd-csi-driver"]

0 commit comments

Comments
 (0)