Merge pull request #240 from groggemans/fix/GH-239

fix: armv7 docker builds
kubernetes-csi · Nov 2, 2021 · 96d13a5 · 96d13a5
2 parents e9bd4d1 + 741a706
commit 96d13a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -12,10 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG ARCH=amd64
-
 FROM k8s.gcr.io/build-image/debian-base:buster-v1.6.0
 
+# Architecture for bin folder
+ARG ARCH
+
 # Copy nfsplugin from build _output directory
 COPY bin/${ARCH}/nfsplugin /nfsplugin
 

diff --git a/Makefile b/Makefile
@@ -100,7 +100,7 @@ nfs:
 
 .PHONY: nfs-armv7
 nfs-armv7:
-	CGO_ENABLED=0 GOOS=linux GOARCH=arm go build -a -ldflags "${LDFLAGS} ${EXT_LDFLAGS}" -mod vendor -o bin/arm/v7/nfsplugin ./cmd/nfsplugin
+	CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=7 go build -a -ldflags "${LDFLAGS} ${EXT_LDFLAGS}" -mod vendor -o bin/arm/v7/nfsplugin ./cmd/nfsplugin
 
 .PHONY: container-build
 container-build: