8000 Deprecate "go-wrapper" script in 1.10+ · tomlinux/golang@fe39454 · GitHub
[go: up one dir, main page]
Skip to content

Commit fe39454

Browse files
tianontianon
committed
Deprecate "go-wrapper" script in 1.10+
1 parent ad742b9 commit fe39454

File tree

7 files changed

+27
-219
lines changed

7 files changed

+27
-219
lines changed

‎1.10-rc/alpine3.7/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,3 @@ ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
5656

5757
RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
5858
WORKDIR $GOPATH
59-
60-
COPY go-wrapper /usr/local/bin/

‎1.10-rc/alpine3.7/go-wrapper

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

‎1.10-rc/stretch/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,3 @@ ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
4848

4949
RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
5050
WORKDIR $GOPATH
51-
52-
COPY go-wrapper /usr/local/bin/

‎1.10-rc/stretch/go-wrapper

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

‎Dockerfile-alpine.template

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:%%ALPINE-VERSION%%
1+
FROM alpine:%%TAG%%
22

33
RUN apk add --no-cache ca-certificates
44

@@ -56,5 +56,3 @@ ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
5656

5757
RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
5858
WORKDIR $GOPATH
59-
60-
COPY go-wrapper /usr/local/bin/

‎Dockerfile-debian.template

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM buildpack-deps:%%DEBIAN-SUITE%%-scm
1+
FROM buildpack-deps:%%TAG%%-scm
22

33
# gcc for cgo
44
RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -38,5 +38,3 @@ ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
3838

3939
RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
4040
WORKDIR $GOPATH
41-
42-
COPY go-wrapper /usr/local/bin/

‎update.sh

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -83,29 +83,39 @@ for version in "${versions[@]}"; do
8383

8484
windowsSha256="$(curl -fsSL "https://storage.googleapis.com/golang/go${fullVersion}.windows-amd64.zip.sha256")"
8585

86-
for variant in alpine3.{4,5,6,7}; do
86+
for variant in \
87+
alpine3.{4,5,6,7} \
88+
stretch jessie wheezy \
89+
; do
8790
if [ -d "$version/$variant" ]; then
88-
ver="${variant#alpine}"
91+
tag="$variant"
92+
template='debian'
93+
case "$variant" in
94+
alpine*) tag="${variant#alpine}"; template='alpine' ;;
95+
esac
96+
8997
sed -r \
9098
-e 's!%%VERSION%%!'"$fullVersion"'!g' \
91-
-e 's!%%ALPINE-VERSION%%!'"$ver"'!g' \
99+
-e 's!%%TAG%%!'"$tag"'!g' \
92100
-e 's!%%SRC-SHA256%%!'"$srcSha256"'!g' \
93-
Dockerfile-alpine.template > "$version/$variant/Dockerfile"
94-
cp go-wrapper "$version/$variant/"
95-
travisEnv='\n - VERSION='"$version VARIANT=$variant$travisEnv"
96-
fi
97-
done
98-
for variant in stretch jessie wheezy; do
99-
if [ -d "$version/$variant" ]; then
100-
sed -r \
101-
-e 's!%%VERSION%%!'"$fullVersion"'!g' \
102-
-e 's!%%DEBIAN-SUITE%%!'"$variant"'!g' \
103101
-e 's!%%ARCH-CASE%%!'"$(sed_escape_rhs "$linuxArchCase")"'!g' \
104-
Dockerfile-debian.template > "$version/$variant/Dockerfile"
105-
cp go-wrapper "$version/$variant/"
102+
"Dockerfile-${template}.template" > "$version/$variant/Dockerfile"
103+
104+
case "$version" in
105+
1.8|1.9)
106+
# our "go-wrapper" script is officially deprecated in 1.10+
107+
cp -a go-wrapper "$version/$variant/"
108+
cat >> "$version/$variant/Dockerfile" <<-'EODF'
109+
110+
COPY go-wrapper /usr/local/bin/
111+
EODF
112+
;;
113+
esac
114+
106115
travisEnv='\n - VERSION='"$version VARIANT=$variant$travisEnv"
107116
fi
108117
done
118+
109119
for winVariant in \
110120
nanoserver-{1709,sac2016} \
111121
windowsservercore-{1709,ltsc2016} \

0 commit comments

Comments
 (0)
0