From 73558b65009ae95e19cc94c2b1baff381a577371 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 20 Dec 2019 15:56:54 -0800 Subject: [PATCH] Appropriately set GOARM on Alpine's armv7 --- 1.12/alpine3.10/Dockerfile | 1 + 1.12/alpine3.11/Dockerfile | 1 + 1.13/alpine3.10/Dockerfile | 1 + 1.13/alpine3.11/Dockerfile | 1 + 1.14-rc/alpine3.11/Dockerfile | 1 + Dockerfile-alpine.template | 1 + 6 files changed, 6 insertions(+) diff --git a/1.12/alpine3.10/Dockerfile b/1.12/alpine3.10/Dockerfile index f9c72edd..27fbc1b2 100644 --- 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 index 1f6175c2..019ffdaa 100644 --- 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 index 58d79664..ebfb43c0 100644 --- 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 index 86012ca8..485a4a1d 100644 --- 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 index 8d3fc88d..8323e9f6 100644 --- 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 index 642431f2..86975ad2 100644 --- 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; \ \