Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update golang #9468

Merged
merged 1 commit into from
Jan 21, 2021
Merged

Update golang #9468

merged 1 commit into from
Jan 21, 2021

Conversation

tianon
Copy link
Member

@tianon tianon commented Jan 21, 2021

Changes:

Changes:

- docker-library/golang@b22b41f: Merge pull request docker-library/golang#355 from infosiftr/alpine-386
- docker-library/golang@e069ef4: Update GO386 to "softfloat" in 1.16+
@github-actions
Copy link

Diff for 15e8a0d:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index ff6d6bb..ef63956 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -87,12 +87,12 @@ Constraints: windowsservercore-ltsc2016
 
 Tags: 1.16beta1-alpine3.12, 1.16-rc-alpine3.12, rc-alpine3.12
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 2d03ce7ef01477465c84c13d68818ab2bedc7b16
+GitCommit: e069ef401a3eee2d16b5ad4dce939eaa02ae1bd1
 Directory: 1.16-rc/alpine3.12
 
 Tags: 1.16beta1-alpine3.13, 1.16-rc-alpine3.13, rc-alpine3.13, 1.16beta1-alpine, 1.16-rc-alpine, rc-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0300e67182c4e18538e4aab6dd0a4630986facfb
+GitCommit: e069ef401a3eee2d16b5ad4dce939eaa02ae1bd1
 Directory: 1.16-rc/alpine3.13
 
 Tags: 1.16beta1-buster, 1.16-rc-buster, rc-buster
diff --git a/golang_rc-alpine/Dockerfile b/golang_rc-alpine/Dockerfile
index 7f15c1e..fc28814 100644
--- a/golang_rc-alpine/Dockerfile
+++ b/golang_rc-alpine/Dockerfile
@@ -43,7 +43,7 @@ RUN set -eux; \
 	case "$apkArch" in \
 		armhf) export GOARM='6' ;; \
 		armv7) export GOARM='7' ;; \
-		x86) export GO386='387' ;; \
+		x86) export GO386='softfloat' ;; \
 	esac; \
 	\
 # https://github.com/golang/go/issues/38536#issuecomment-616897960
diff --git a/golang_rc-alpine3.12/Dockerfile b/golang_rc-alpine3.12/Dockerfile
index bcb8934..678e9d4 100644
--- a/golang_rc-alpine3.12/Dockerfile
+++ b/golang_rc-alpine3.12/Dockerfile
@@ -43,7 +43,7 @@ RUN set -eux; \
 	case "$apkArch" in \
 		armhf) export GOARM='6' ;; \
 		armv7) export GOARM='7' ;; \
-		x86) export GO386='387' ;; \
+		x86) export GO386='softfloat' ;; \
 	esac; \
 	\
 # https://github.com/golang/go/issues/38536#issuecomment-616897960

@yosifkit yosifkit merged commit acb6a3a into docker-library:master Jan 21, 2021
@yosifkit yosifkit deleted the golang branch January 21, 2021 18:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants