Skip to content

Commit acf6e86

Browse files
authored
Merge pull request #498 from infosiftr/GOARM=7
Set GOARM=7 explicitly for arm32v7 images
2 parents 9f8bfe7 + 40db26d commit acf6e86

File tree

5 files changed

+47
-0
lines changed

5 files changed

+47
-0
lines changed

1.21/alpine3.18/Dockerfile

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

1.21/alpine3.19/Dockerfile

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

1.21/bookworm/Dockerfile

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

1.21/bullseye/Dockerfile

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile-linux.template

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,17 @@ RUN set -eux; \
193193
/usr/local/go/src/cmd/dist/dist \
194194
"$GOCACHE" \
195195
; \
196+
{{ if [ "1.20" ] | index(env.version) then "" elif .arches["arm32v7"].url // "" | contains("armv6") then ( -}}
197+
elif [ "$arch" = {{ os_arches["arm32v7"] | @sh }} ]; then \
198+
[ -s /usr/local/go/go.env ]; \
199+
before="$(go env GOARM)"; [ "$before" != {{ .arches["arm32v7"].env["GOARM"] | @sh }} ]; \
200+
{ \
201+
echo; \
202+
echo '# https://github.com/docker-library/golang/issues/494'; \
203+
echo {{ "GOARM=\(.arches["arm32v7"].env["GOARM"])" | @sh }}; \
204+
} >> /usr/local/go/go.env; \
205+
after="$(go env GOARM)"; [ "$after" = {{ .arches["arm32v7"].env["GOARM"] | @sh }} ]; \
206+
{{ ) else "" end -}}
196207
fi; \
197208
\
198209
{{ if is_alpine then ( -}}

0 commit comments

Comments
 (0)