Merge pull request #204 from openshift-cherrypick-robot/cherry-pick-1…

…99-to-release-4.9 [release-4.9] Bug 2103982: Fix build on ARM after rebase
openshift · Jul 20, 2022 · 7f60c78 · 7f60c78
2 parents a441523 + dbdf500
commit 7f60c78
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.16-openshift-4.9 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.9:base
 # Get mkfs & blkid