Set GOARM=7 explicitly for arm32v7 images #498
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Arguably, we should probably add a "verification" block that validates that for a given architecture, all the values in our |
yosifkit
approved these changes
Dec 9, 2023
This fixes the disparity between the "armv6" download of Go from upstream and the image being v7 otherwise (and thus the default value of `GOARM` being `6` instead of `7`, which is unexpected for users of the image). This is set in such a way that environment variables (or `go env -w`) will override it, but without requiring us to recompile Go (which I'm not convinced gives us much gain -- happy to reconsider if someone comes up with a good way to benchmark the compiler).
tianon
commented
Dec 9, 2023
| @@ -193,6 +193,17 @@ RUN set -eux; \ | |||
| /usr/local/go/src/cmd/dist/dist \ | |||
| "$GOCACHE" \ | |||
| ; \ | |||
| {{ if [ "1.20" ] | index(env.version) then "" elif .arches["arm32v7"].url // "" | contains("armv6") then ( -}} | |||
There was a problem hiding this comment.
This is set only on 1.21+ because that's the first version that ships with go.env (I'm not sure if it was supported earlier, but it definitely didn't have any default contents before 1.21 and supported versions are short-lived enough that I'm not too worried about this only being fixed in 1.21+).
docker-library-bot
added a commit
to docker-library-bot/official-images
that referenced
this pull request
Dec 9, 2023
Changes: - docker-library/golang@acf6e86: Merge pull request docker-library/golang#498 from infosiftr/GOARM=7 - docker-library/golang@40db26d: Set GOARM=7 explicitly for arm32v7 images - docker-library/golang@9f8bfe7: Merge pull request docker-library/golang#497 from jnoordsij/add-alpine-3.19 - docker-library/golang@84f47a9: Update templates to add Alpine 3.19 and drop 3.17 - docker-library/golang@5f181d7: Add Alpine 3.19 and drop 3.17 to versions.sh
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes the disparity between the "armv6" download of Go from upstream and the image being v7 otherwise (and thus the default value of
GOARMbeing6instead of7, which is unexpected for users of the image).This is set in such a way that environment variables (or
go env -w) will override it, but without requiring us to recompile Go (which I'm not convinced gives us much gain -- happy to reconsider if someone comes up with a good way to benchmark the compiler).Closes #494