Appropriately set GOARM on Alpine's armv7

docker-library · Dec 23, 2019 · 73558b6 · 73558b6
1 parent 3f57232
commit 73558b6
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 0 deletions.
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.11/Dockerfile b/1.12/alpine3.11/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.13/alpine3.11/Dockerfile b/1.13/alpine3.11/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.11/Dockerfile b/1.14-rc/alpine3.11/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; \
 	\