Skip to content

Commit 10fd051

Browse files
kolyshkinkolyshkin
committed
Bump golang to 1.11.0
It's that time of year again! Go 1.11 is released, time to use it. This commit also * removes our archive/tar fork, since upstream archive/tar is fixed for static builds, and osusergo build tag is set. * removes ENV GO_VERSION from Dockerfile as it's not needed anymore since PR moby#37592 is merged. [v2: switch to beta2] [v3: switch to beta3] [v4: rc1] [v5: remove ENV GO_VERSION as PR moby#37592 is now merged] [v6: rc2] [v7: final!] [v8: use 1.11.0] [v9: back to 1.11] [v8: use 1.11.0] Signed-off-by: Kir Kolyshkin <[email protected]>
1 parent 8ad648b commit 10fd051

16 files changed

Lines changed: 6 additions & 3034 deletions

‎Dockerfile‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@
2424
# the case. Therefore, you don't have to disable it anymore.
2525
#
2626

27-
FROM golang:1.10.4 AS base
28-
# FIXME(vdemeester) this is kept for other script depending on it to not fail right away
29-
# Remove this once the other scripts uses something else to detect the version
30-
ENV GO_VERSION 1.10.4
27+
FROM golang:1.11.0 AS base
3128
# allow replacing httpredir or deb mirror
3229
ARG APT_MIRROR=deb.debian.org
3330
RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list

‎Dockerfile.e2e‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Step 1: Build tests
2-
FROM golang:1.10.4-alpine3.7 as builder
2+
FROM golang:1.11.0-alpine3.7 as builder
33

44
RUN apk add --update \
55
bash \

‎Dockerfile.simple‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# This represents the bare minimum required to build and test Docker.
77

8-
FROM golang:1.10.4-stretch
8+
FROM golang:1.11.0-stretch
99

1010
# allow replacing httpredir or deb mirror
1111
ARG APT_MIRROR=deb.debian.org

‎Dockerfile.windows‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
161161
# Environment variable notes:
162162
# - GO_VERSION must be consistent with 'Dockerfile' used by Linux.
163163
# - FROM_DOCKERFILE is used for detection of building within a container.
164-
ENV GO_VERSION=1.10.4 `
164+
ENV GO_VERSION=1.11 `
165165
GIT_VERSION=2.11.1 `
166166
GOPATH=C:\go `
167167
FROM_DOCKERFILE=1

‎hack/validate/vendor‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ validate_vendor_diff(){
1010

1111
if [ ${#files[@]} -gt 0 ]; then
1212
# Remove vendor/ first so that anything not included in vendor.conf will
13-
# cause the validation to fail. archive/tar is a special case, see vendor.conf
14-
# for details.
15-
ls -d vendor/* | grep -v vendor/archive | xargs rm -rf
13+
# cause the validation to fail.
14+
ls -d vendor/* | xargs rm -rf
1615
# run vndr to recreate vendor/
1716
vndr
1817
# check if any files have changed

‎vendor.conf‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,3 @@ github.com/Nvveen/Gotty a8b993ba6abdb0e0c12b0125c603323a71c7790c https://github.
157157
github.com/docker/go-metrics d466d4f6fd960e01820085bd7e1a24426ee7ef18
158158

159159
github.com/opencontainers/selinux b29023b86e4a69d1b46b7e7b4e2b6fda03f0b9cd
160-
161-
162-
# archive/tar (for Go 1.10, see https://github.com/golang/go/issues/24787)
163-
# mkdir -p ./vendor/archive
164-
# git clone -b go-1.10 --depth=1 [email protected]:kolyshkin/go-tar.git ./vendor/archive/tar
165-
# vndr # to clean up test files

‎vendor/archive/tar/LICENSE‎

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

‎vendor/archive/tar/README.md‎

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

0 commit comments

Comments
 (0)