Skip to content

Commit 46c7c75

Browse files
authored
Merge pull request #884 from amacaskill/madhack
add back in copy from mad-hack version for arm64
2 parents f73e208 + 4519bd1 commit 46c7c75

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

Dockerfile.arm64

+6-2
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,16 @@ 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+
# 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+
2630
# Start from Kubernetes Debian base
2731
# A distroless base is not used because it cannot be tested for ARM until GCE has ARM hardware
2832
FROM k8s.gcr.io/build-image/debian-base:buster-v1.9.0
2933
COPY --from=builder /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/bin/gce-pd-csi-driver /gce-pd-csi-driver
3034
# Install necessary dependencies
3135
RUN clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs
32-
COPY /lib/udev/scsi_id /lib/udev_containerized/scsi_id
36+
COPY --from=mad-hack /lib/udev/scsi_id /lib/udev_containerized/scsi_id
3337

34-
ENTRYPOINT ["/gce-pd-csi-driver"]
38+
ENTRYPOINT ["/gce-pd-csi-driver"]

0 commit comments

Comments
 (0)