Merge pull request #314 from infosiftr/armv7

yosifkit · web-flow · commit 74798044e5b0 · 2019-12-23T13:17:16.000-08:00
Appropriately set GOARM on Alpine's armv7
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; \
 	\

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ RUN set -eux; \`
`33`	`33`	`apkArch="$(apk --print-arch)"; \`
`34`	`34`	`case "$apkArch" in \`
`35`	`35`	`armhf) export GOARM='6' ;; \`
	`36`	`+ armv7) export GOARM='7' ;; \`
`36`	`37`	`x86) export GO386='387' ;; \`
`37`	`38`	`esac; \`
`38`	`39`	`\`