Skip to content

Commit b22b41f

Browse files
authored
Merge pull request #355 from infosiftr/alpine-386
Update GO386 to "softfloat" in 1.16+
2 parents 45f79a2 + e069ef4 commit b22b41f

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

1.16-rc/alpine3.12/Dockerfile

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

1.16-rc/alpine3.13/Dockerfile

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile-alpine.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RUN set -eux; \
3737
case "$apkArch" in \
3838
armhf) export GOARM='6' ;; \
3939
armv7) export GOARM='7' ;; \
40-
x86) export GO386='387' ;; \
40+
x86) export GO386='{{ if env.version == "1.14" or env.version == "1.15" then "387" else "softfloat" end }}' ;; \
4141
esac; \
4242
\
4343
# https://github.com/golang/go/issues/38536#issuecomment-616897960

0 commit comments

Comments
 (0)