diff --git a/.travis.yml b/.travis.yml index 4d353fce..903a5e0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ matrix: env: VERSION=1.12-rc VARIANT=windows/windowsservercore-1803 - os: linux env: VERSION=1.12-rc VARIANT=stretch + - os: linux + env: VERSION=1.12-rc VARIANT=alpine3.9 - os: linux env: VERSION=1.12-rc VARIANT=alpine3.8 - os: windows @@ -16,18 +18,18 @@ matrix: - os: linux env: VERSION=1.11 VARIANT=stretch - os: linux - env: VERSION=1.11 VARIANT=alpine3.8 + env: VERSION=1.11 VARIANT=alpine3.9 - os: linux - env: VERSION=1.11 VARIANT=alpine3.7 + env: VERSION=1.11 VARIANT=alpine3.8 - os: windows dist: 1803-containers env: VERSION=1.10 VARIANT=windows/windowsservercore-1803 - os: linux env: VERSION=1.10 VARIANT=stretch - os: linux - env: VERSION=1.10 VARIANT=alpine3.8 + env: VERSION=1.10 VARIANT=alpine3.9 - os: linux - env: VERSION=1.10 VARIANT=alpine3.7 + env: VERSION=1.10 VARIANT=alpine3.8 install: - git clone https://github.com/docker-library/official-images.git ~/official-images diff --git a/1.10/alpine3.7/Dockerfile b/1.10/alpine3.9/Dockerfile similarity index 99% rename from 1.10/alpine3.7/Dockerfile rename to 1.10/alpine3.9/Dockerfile index 4094a255..4fd34216 100644 --- a/1.10/alpine3.7/Dockerfile +++ b/1.10/alpine3.9/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.9 RUN apk add --no-cache \ ca-certificates diff --git a/1.11/alpine3.7/Dockerfile b/1.11/alpine3.9/Dockerfile similarity index 99% rename from 1.11/alpine3.7/Dockerfile rename to 1.11/alpine3.9/Dockerfile index a37d3189..d6a56cb8 100644 --- a/1.11/alpine3.7/Dockerfile +++ b/1.11/alpine3.9/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.9 RUN apk add --no-cache \ ca-certificates diff --git a/1.12-rc/alpine3.9/Dockerfile b/1.12-rc/alpine3.9/Dockerfile new file mode 100644 index 00000000..7adff4a7 --- /dev/null +++ b/1.12-rc/alpine3.9/Dockerfile @@ -0,0 +1,63 @@ +FROM alpine:3.9 + +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.12beta2 + +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' ;; \ + x86) export GO386='387' ;; \ + esac; \ + \ + wget -O go.tgz "https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz"; \ + echo 'fd3f4e1860ac59d647c22a2c1589fcf4a96c02bbbfef1ca1ea44bc25cf62a490 *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 0f942563..9a058cf0 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -9,7 +9,7 @@ declare -A aliases=( defaultDebianSuite='stretch' declare -A debianSuite=( ) -defaultAlpineVersion='3.8' +defaultAlpineVersion='3.9' declare -A alpineVersion=( #[1.9]='3.7' ) @@ -72,7 +72,7 @@ for version in "${versions[@]}"; do ) for v in \ - stretch alpine3.{8,7} \ + stretch alpine{3.9,3.8} \ windows/windowsservercore-{ltsc2016,1709,1803,1809} \ windows/nanoserver-{sac2016,1709,1803,1809} \ ; do diff --git a/update.sh b/update.sh index f4c8a766..f1183441 100755 --- a/update.sh +++ b/update.sh @@ -84,7 +84,7 @@ for version in "${versions[@]}"; do windowsSha256="$(curl -fsSL "https://storage.googleapis.com/golang/go${fullVersion}.windows-amd64.zip.sha256")" for variant in \ - alpine3.{7,8} \ + alpine{3.8,3.9} \ stretch \ ; do if [ -d "$version/$variant" ]; then