From dbdf50060a6eb7f02ea980c6e2d2c28533972a03 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Mon, 7 Feb 2022 11:30:21 -0500
Subject: [PATCH] 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).
---
 Dockerfile.openshift       | 2 +-
 Dockerfile.openshift.rhel7 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.openshift b/Dockerfile.openshift
index feaefc791..38671a3f2 100644
--- 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
index a6e64f529..5c5d3f20b 100644
--- 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