diff --git a/1.13/alpine3.10/Dockerfile b/1.13/alpine3.12/Dockerfile similarity index 99% rename from 1.13/alpine3.10/Dockerfile rename to 1.13/alpine3.12/Dockerfile index a17fd416..9ce81619 100644 --- a/1.13/alpine3.10/Dockerfile +++ b/1.13/alpine3.12/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.10 +FROM alpine:3.12 RUN apk add --no-cache \ ca-certificates diff --git a/1.14/alpine3.12/Dockerfile b/1.14/alpine3.12/Dockerfile new file mode 100644 index 00000000..444cd56c --- /dev/null +++ b/1.14/alpine3.12/Dockerfile @@ -0,0 +1,64 @@ +FROM alpine:3.12 + +RUN apk add --no-cache \ + ca-certificates + +# set up nsswitch.conf for Go's "netgo" implementation +# - https://github.com/golang/go/blob/go1.9.1/src/net/conf.go#L194-L275 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf + +ENV GOLANG_VERSION 1.14.3 + +RUN set -eux; \ + apk add --no-cache --virtual .build-deps \ + bash \ + gcc \ + musl-dev \ + openssl \ + go \ + ; \ + export \ +# set GOROOT_BOOTSTRAP such that we can actually build Go + GOROOT_BOOTSTRAP="$(go env GOROOT)" \ +# ... and set "cross-building" related vars to the installed system's values so that we create a build targeting the proper arch +# (for example, if our build host is GOARCH=amd64, but our build env/image is GOARCH=386, our build needs GOARCH=386) + GOOS="$(go env GOOS)" \ + GOARCH="$(go env GOARCH)" \ + GOHOSTOS="$(go env GOHOSTOS)" \ + GOHOSTARCH="$(go env GOHOSTARCH)" \ + ; \ +# also explicitly set GO386 and GOARM if appropriate +# https://github.com/docker-library/golang/issues/184 + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + armhf) export GOARM='6' ;; \ + armv7) export GOARM='7' ;; \ + x86) export GO386='387' ;; \ + esac; \ + \ + wget -O go.tgz "https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz"; \ + echo '93023778d4d1797b7bc6a53e86c3a9b150c923953225f8a48a2d5fabc971af56 *go.tgz' | sha256sum -c -; \ + tar -C /usr/local -xzf go.tgz; \ + rm go.tgz; \ + \ + cd /usr/local/go/src; \ + ./make.bash; \ + \ + rm -rf \ +# https://github.com/golang/go/blob/0b30cf534a03618162d3015c8705dd2231e34703/src/cmd/dist/buildtool.go#L121-L125 + /usr/local/go/pkg/bootstrap \ +# https://golang.org/cl/82095 +# https://github.com/golang/build/blob/e3fe1605c30f6a3fd136b561569933312ede8782/cmd/release/releaselet.go#L56 + /usr/local/go/pkg/obj \ + ; \ + apk del .build-deps; \ + \ + export PATH="/usr/local/go/bin:$PATH"; \ + go version + +ENV GOPATH /go +ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH + +RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH" +WORKDIR $GOPATH diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 64748d64..9caca288 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -10,7 +10,7 @@ defaultDebianSuite='buster' declare -A debianSuite=( #[1.13-rc]='buster' ) -defaultAlpineVersion='3.11' +defaultAlpineVersion='3.12' declare -A alpineVersion=( #[1.9]='3.7' ) @@ -77,7 +77,7 @@ for version in "${versions[@]}"; do ) for v in \ - buster stretch alpine{3.11,3.10} \ + buster stretch alpine{3.12,3.11} \ windows/windowsservercore-{ltsc2016,1809} \ windows/nanoserver-1809 \ ; do diff --git a/update.sh b/update.sh index 354b7697..01867ae8 100755 --- a/update.sh +++ b/update.sh @@ -82,7 +82,7 @@ for version in "${versions[@]}"; do windowsSha256="$(curl -fsSL "https://storage.googleapis.com/golang/go${fullVersion}.windows-amd64.zip.sha256")" for variant in \ - alpine{3.10,3.11} \ + alpine{3.11,3.12} \ stretch buster \ ; do if [ -d "$version/$variant" ]; then