Skip to content

Commit 7479804

Browse files
authored
Merge pull request #314 from infosiftr/armv7
Appropriately set GOARM on Alpine's armv7
2 parents 3f57232 + 73558b6 commit 7479804

File tree

6 files changed

+6
-0
lines changed

6 files changed

+6
-0
lines changed

1.12/alpine3.10/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ RUN set -eux; \
3333
apkArch="$(apk --print-arch)"; \
3434
case "$apkArch" in \
3535
armhf) export GOARM='6' ;; \
36+
armv7) export GOARM='7' ;; \
3637
x86) export GO386='387' ;; \
3738
esac; \
3839
\

1.12/alpine3.11/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ RUN set -eux; \
3333
apkArch="$(apk --print-arch)"; \
3434
case "$apkArch" in \
3535
armhf) export GOARM='6' ;; \
36+
armv7) export GOARM='7' ;; \
3637
x86) export GO386='387' ;; \
3738
esac; \
3839
\

1.13/alpine3.10/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ RUN set -eux; \
3333
apkArch="$(apk --print-arch)"; \
3434
case "$apkArch" in \
3535
armhf) export GOARM='6' ;; \
36+
armv7) export GOARM='7' ;; \
3637
x86) export GO386='387' ;; \
3738
esac; \
3839
\

1.13/alpine3.11/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ RUN set -eux; \
3333
apkArch="$(apk --print-arch)"; \
3434
case "$apkArch" in \
3535
armhf) export GOARM='6' ;; \
36+
armv7) export GOARM='7' ;; \
3637
x86) export GO386='387' ;; \
3738
esac; \
3839
\

1.14-rc/alpine3.11/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ RUN set -eux; \
3333
apkArch="$(apk --print-arch)"; \
3434
case "$apkArch" in \
3535
armhf) export GOARM='6' ;; \
36+
armv7) export GOARM='7' ;; \
3637
x86) export GO386='387' ;; \
3738
esac; \
3839
\

Dockerfile-alpine.template

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ RUN set -eux; \
3333
apkArch="$(apk --print-arch)"; \
3434
case "$apkArch" in \
3535
armhf) export GOARM='6' ;; \
36+
armv7) export GOARM='7' ;; \
3637
x86) export GO386='387' ;; \
3738
esac; \
3839
\

0 commit comments

Comments
 (0)