mirror of
https://github.com/docker-library/golang.git
synced 2025-02-06 11:01:20 +00:00
Merge pull request #417 from infosiftr/go-1.18-alpine-ppc64le
Temporarily apply upstream patch for 1.18 + Alpine + ppc64le
This commit is contained in:
commit
e92bd5116b
8
1.18/alpine3.14/Dockerfile
generated
8
1.18/alpine3.14/Dockerfile
generated
@ -78,6 +78,14 @@ RUN set -eux; \
|
||||
go \
|
||||
musl-dev \
|
||||
; \
|
||||
if [ "$GOARCH" = 'ppc64le' ]; then \
|
||||
# https://github.com/golang/go/issues/51787
|
||||
wget -O ppc64le-alpine.patch 'https://github.com/golang/go/commit/946167906ed8646c433c257b074a10e01f0a7dab.patch'; \
|
||||
apk add --no-cache --virtual .build-patch patch; \
|
||||
patch --strip=1 --input="$PWD/ppc64le-alpine.patch" --directory=/usr/local/go; \
|
||||
apk del --no-network .build-patch; \
|
||||
rm ppc64le-alpine.patch; \
|
||||
fi; \
|
||||
\
|
||||
( \
|
||||
cd /usr/local/go/src; \
|
||||
|
8
1.18/alpine3.15/Dockerfile
generated
8
1.18/alpine3.15/Dockerfile
generated
@ -78,6 +78,14 @@ RUN set -eux; \
|
||||
go \
|
||||
musl-dev \
|
||||
; \
|
||||
if [ "$GOARCH" = 'ppc64le' ]; then \
|
||||
# https://github.com/golang/go/issues/51787
|
||||
wget -O ppc64le-alpine.patch 'https://github.com/golang/go/commit/946167906ed8646c433c257b074a10e01f0a7dab.patch'; \
|
||||
apk add --no-cache --virtual .build-patch patch; \
|
||||
patch --strip=1 --input="$PWD/ppc64le-alpine.patch" --directory=/usr/local/go; \
|
||||
apk del --no-network .build-patch; \
|
||||
rm ppc64le-alpine.patch; \
|
||||
fi; \
|
||||
\
|
||||
( \
|
||||
cd /usr/local/go/src; \
|
||||
|
@ -134,6 +134,16 @@ RUN set -eux; \
|
||||
go \
|
||||
musl-dev \
|
||||
; \
|
||||
{{ if env.version == "1.18" then ( -}}
|
||||
if [ "$GOARCH" = 'ppc64le' ]; then \
|
||||
# https://github.com/golang/go/issues/51787
|
||||
wget -O ppc64le-alpine.patch 'https://github.com/golang/go/commit/946167906ed8646c433c257b074a10e01f0a7dab.patch'; \
|
||||
apk add --no-cache --virtual .build-patch patch; \
|
||||
patch --strip=1 --input="$PWD/ppc64le-alpine.patch" --directory=/usr/local/go; \
|
||||
apk del --no-network .build-patch; \
|
||||
rm ppc64le-alpine.patch; \
|
||||
fi; \
|
||||
{{ ) else "" end -}}
|
||||
{{ ) else ( -}}
|
||||
savedAptMark="$(apt-mark showmanual)"; \
|
||||
apt-get update; \
|
||||
|
Loading…
x
Reference in New Issue
Block a user