Fix build on ARM after rebase

The Makefile now defines ARCH?=amd64 which is used to define GOARCH, which breaks the builds on other arches (namely arm64, given this is for AWS).
dobsonj · Feb 7, 2022 · f5fa465 · f5fa465
1 parent 153118c
commit f5fa465
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Dockerfile.openshift b/Dockerfile.openshift
@@ -1,7 +1,7 @@
 FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder
 WORKDIR /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver
 COPY . .
-RUN make
+RUN make ARCH=$(go env GOARCH)
 
 FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
 # Get mkfs & blkid

diff --git a/Dockerfile.openshift.rhel7 b/Dockerfile.openshift.rhel7
@@ -1,7 +1,7 @@
 FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 AS builder
 WORKDIR /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver
 COPY . .
-RUN make
+RUN make ARCH=$(go env GOARCH)
 
 FROM registry.ci.openshift.org/ocp/4.10:base
 # Get mkfs & blkid