Merge pull request #355 from infosiftr/alpine-386

Update GO386 to "softfloat" in 1.16+
docker-library · Jan 21, 2021 · b22b41f · b22b41f
2 parents 45f79a2 + e069ef4
commit b22b41f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/1.16-rc/alpine3.12/Dockerfile b/1.16-rc/alpine3.12/Dockerfile
diff --git a/1.16-rc/alpine3.13/Dockerfile b/1.16-rc/alpine3.13/Dockerfile
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -37,7 +37,7 @@ RUN set -eux; \
 	case "$apkArch" in \
 		armhf) export GOARM='6' ;; \
 		armv7) export GOARM='7' ;; \
-		x86) export GO386='387' ;; \
+		x86) export GO386='{{ if env.version == "1.14" or env.version == "1.15" then "387" else "softfloat" end }}' ;; \
 	esac; \
 	\
 # https://github.com/golang/go/issues/38536#issuecomment-616897960