Merge pull request #885 from amacaskill/release-1.4

Cherry pick #884 to release-1.4

Author: k8s-ci-robot

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"]
+ENTRYPOINT ["/gce-pd-csi-driver"]