Skip to content

Commit 4c8151d

Browse files
tianontianon
authored
Merge pull request docker-library#235 from michael-k/1.9
Remove the now EOL 1.9 and related compatibility code
2 parents 1a7381c + 69f2d2a commit 4c8151d

File tree

22 files changed

+0
-987
lines changed

22 files changed

+0
-987
lines changed

‎.appveyor.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ image: Visual Studio 2017
33

44
environment:
55
matrix:
6-
- version: 1.9
7-
variant: windowsservercore-ltsc2016
8-
- version: 1.9
9-
variant: nanoserver-sac2016
106
- version: 1.11-rc
117
variant: windowsservercore-ltsc2016
128
- version: 1.11-rc

‎.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ language: bash
22
services: docker
33

44
env:
5-
- VERSION=1.9 VARIANT=stretch
6-
- VERSION=1.9 VARIANT=alpine3.8
7-
- VERSION=1.9 VARIANT=alpine3.7
85
- VERSION=1.11-rc VARIANT=stretch
96
- VERSION=1.11-rc VARIANT=alpine3.8
107
- VERSION=1.11-rc VARIANT=alpine3.7

‎1.10/alpine3.7/Dockerfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
1010

1111
ENV GOLANG_VERSION 1.10.4
1212

13-
# make-sure-R0-is-zero-before-main-on-ppc64le.patch: https://github.com/golang/go/commit/9aea0e89b6df032c29d0add8d69ba2c95f1106d9 (Go 1.9)
14-
#COPY *.patch /go-alpine-patches/
15-
1613
RUN set -eux; \
1714
apk add --no-cache --virtual .build-deps \
1815
bash \
@@ -45,14 +42,9 @@ RUN set -eux; \
4542
rm go.tgz; \
4643
\
4744
cd /usr/local/go/src; \
48-
for p in /go-alpine-patches/*.patch; do \
49-
[ -f "$p" ] || continue; \
50-
patch -p2 -i "$p"; \
51-
done; \
5245
./make.bash; \
5346
\
5447
rm -rf \
55-
/go-alpine-patches \
5648
# https://github.com/golang/go/blob/0b30cf534a03618162d3015c8705dd2231e34703/src/cmd/dist/buildtool.go#L121-L125
5749
/usr/local/go/pkg/bootstrap \
5850
# https://golang.org/cl/82095

‎1.10/alpine3.8/Dockerfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
1010

1111
ENV GOLANG_VERSION 1.10.4
1212

13-
# make-sure-R0-is-zero-before-main-on-ppc64le.patch: https://github.com/golang/go/commit/9aea0e89b6df032c29d0add8d69ba2c95f1106d9 (Go 1.9)
14-
#COPY *.patch /go-alpine-patches/
15-
1613
RUN set -eux; \
1714
apk add --no-cache --virtual .build-deps \
1815
bash \
@@ -45,14 +42,9 @@ RUN set -eux; \
4542
rm go.tgz; \
4643
\
4744
cd /usr/local/go/src; \
48-
for p in /go-alpine-patches/*.patch; do \
49-
[ -f "$p" ] || continue; \
50-
patch -p2 -i "$p"; \
51-
done; \
5245
./make.bash; \
5346
\
5447
rm -rf \
55-
/go-alpine-patches \
5648
# https://github.com/golang/go/blob/0b30cf534a03618162d3015c8705dd2231e34703/src/cmd/dist/buildtool.go#L121-L125
5749
/usr/local/go/pkg/bootstrap \
5850
# https://golang.org/cl/82095

‎1.11-rc/alpine3.7/Dockerfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
1010

1111
ENV GOLANG_VERSION 1.11rc2
1212

13-
# make-sure-R0-is-zero-before-main-on-ppc64le.patch: https://github.com/golang/go/commit/9aea0e89b6df032c29d0add8d69ba2c95f1106d9 (Go 1.9)
14-
#COPY *.patch /go-alpine-patches/
15-
1613
RUN set -eux; \
1714
apk add --no-cache --virtual .build-deps \
1815
bash \
@@ -45,14 +42,9 @@ RUN set -eux; \
4542
rm go.tgz; \
4643
\
4744
cd /usr/local/go/src; \
48-
for p in /go-alpine-patches/*.patch; do \
49-
[ -f "$p" ] || continue; \
50-
patch -p2 -i "$p"; \
51-
done; \
5245
./make.bash; \
5346
\
5447
rm -rf \
55-
/go-alpine-patches \
5648
# https://github.com/golang/go/blob/0b30cf534a03618162d3015c8705dd2231e34703/src/cmd/dist/buildtool.go#L121-L125
5749
/usr/local/go/pkg/bootstrap \
5850
# https://golang.org/cl/82095

‎1.11-rc/alpine3.8/Dockerfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
1010

1111
ENV GOLANG_VERSION 1.11rc2
1212

13-
# make-sure-R0-is-zero-before-main-on-ppc64le.patch: https://github.com/golang/go/commit/9aea0e89b6df032c29d0add8d69ba2c95f1106d9 (Go 1.9)
14-
#COPY *.patch /go-alpine-patches/
15-
1613
RUN set -eux; \
1714
apk add --no-cache --virtual .build-deps \
1815
bash \
@@ -45,14 +42,9 @@ RUN set -eux; \
4542
rm go.tgz; \
4643
\
4744
cd /usr/local/go/src; \
48-
for p in /go-alpine-patches/*.patch; do \
49-
[ -f "$p" ] || continue; \
50-
patch -p2 -i "$p"; \
51-
done; \
5245
./make.bash; \
5346
\
5447
rm -rf \
55-
/go-alpine-patches \
5648
# https://github.com/golang/go/blob/0b30cf534a03618162d3015c8705dd2231e34703/src/cmd/dist/buildtool.go#L121-L125
5749
/usr/local/go/pkg/bootstrap \
5850
# https://golang.org/cl/82095

‎1.9/alpine3.7/Dockerfile

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎1.9/alpine3.7/go-wrapper

Lines changed: 0 additions & 97 deletions
This file was deleted.

‎1.9/alpine3.7/make-sure-R0-is-zero-before-main-on-ppc64le.patch

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎1.9/alpine3.8/Dockerfile

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)