Appropriately set GOARM on Alpine's armv7

tianon · tianon · commit 5fc08766ca84 · 2019-12-20T15:56:54.000-08:00
diff --git a/1.12/alpine3.10/Dockerfile b/1.12/alpine3.10/Dockerfile
@@ -33,6 +33,7 @@ RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		armhf) export GOARM='6' ;; \
+		armv7) export GOARM='7' ;; \
 		x86) export GO386='387' ;; \
 	esac; \
 	\
diff --git a/1.12/alpine3.9/Dockerfile b/1.12/alpine3.9/Dockerfile
@@ -33,6 +33,7 @@ RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		armhf) export GOARM='6' ;; \
+		armv7) export GOARM='7' ;; \
 		x86) export GO386='387' ;; \
 	esac; \
 	\
diff --git a/1.13/alpine3.10/Dockerfile b/1.13/alpine3.10/Dockerfile
@@ -33,6 +33,7 @@ RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		armhf) export GOARM='6' ;; \
+		armv7) export GOARM='7' ;; \
 		x86) export GO386='387' ;; \
 	esac; \
 	\
diff --git a/1.14-rc/alpine3.10/Dockerfile b/1.14-rc/alpine3.10/Dockerfile
@@ -33,6 +33,7 @@ RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		armhf) export GOARM='6' ;; \
+		armv7) export GOARM='7' ;; \
 		x86) export GO386='387' ;; \
 	esac; \
 	\
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -33,6 +33,7 @@ RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		armhf) export GOARM='6' ;; \
+		armv7) export GOARM='7' ;; \
 		x86) export GO386='387' ;; \
 	esac; \
 	\
