diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index fe2b26044..3c1a013f0 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -23,12 +23,16 @@ WORKDIR /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver ADD . . RUN GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GCE_PD_CSI_STAGING_VERSION=$STAGINGVERSION make gce-pd-driver +# MAD HACKS: Build a version first so we can take the scsi_id bin and put it somewhere else in our real build +FROM k8s.gcr.io/build-image/debian-base:buster-v1.9.0 as mad-hack +RUN clean-install udev + # Start from Kubernetes Debian base # A distroless base is not used because it cannot be tested for ARM until GCE has ARM hardware FROM k8s.gcr.io/build-image/debian-base:buster-v1.9.0 COPY --from=builder /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/bin/gce-pd-csi-driver /gce-pd-csi-driver # Install necessary dependencies RUN clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs -COPY /lib/udev/scsi_id /lib/udev_containerized/scsi_id +COPY --from=mad-hack /lib/udev/scsi_id /lib/udev_containerized/scsi_id -ENTRYPOINT ["/gce-pd-csi-driver"] \ No newline at end of file +ENTRYPOINT ["/gce-pd-csi-driver"]