Skip to content

Commit

Permalink
Bump golang to 1.11.0
Browse files Browse the repository at this point in the history
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 #37592 is merged.

[v2: switch to beta2]
[v3: switch to beta3]
[v4: rc1]
[v5: remove ENV GO_VERSION as PR #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 <kolyshkin@gmail.com>
  • Loading branch information
kolyshkin committed Sep 6, 2018
1 parent 8ad648b commit 10fd051
Show file tree
Hide file tree
Showing 16 changed files with 6 additions and 3,034 deletions.
5 changes: 1 addition & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
# the case. Therefore, you don't have to disable it anymore.
#

FROM golang:1.10.4 AS base
# FIXME(vdemeester) this is kept for other script depending on it to not fail right away
# Remove this once the other scripts uses something else to detect the version
ENV GO_VERSION 1.10.4
FROM golang:1.11.0 AS base
# allow replacing httpredir or deb mirror
ARG APT_MIRROR=deb.debian.org
RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.e2e
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## Step 1: Build tests
FROM golang:1.10.4-alpine3.7 as builder
FROM golang:1.11.0-alpine3.7 as builder

RUN apk add --update \
bash \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.simple
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

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

FROM golang:1.10.4-stretch
FROM golang:1.11.0-stretch

# allow replacing httpredir or deb mirror
ARG APT_MIRROR=deb.debian.org
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
# Environment variable notes:
# - GO_VERSION must be consistent with 'Dockerfile' used by Linux.
# - FROM_DOCKERFILE is used for detection of building within a container.
ENV GO_VERSION=1.10.4 `
ENV GO_VERSION=1.11 `
GIT_VERSION=2.11.1 `
GOPATH=C:\go `
FROM_DOCKERFILE=1
Expand Down
5 changes: 2 additions & 3 deletions hack/validate/vendor
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ validate_vendor_diff(){

if [ ${#files[@]} -gt 0 ]; then
# Remove vendor/ first so that anything not included in vendor.conf will
# cause the validation to fail. archive/tar is a special case, see vendor.conf
# for details.
ls -d vendor/* | grep -v vendor/archive | xargs rm -rf
# cause the validation to fail.
ls -d vendor/* | xargs rm -rf
# run vndr to recreate vendor/
vndr
# check if any files have changed
Expand Down
6 changes: 0 additions & 6 deletions vendor.conf
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,3 @@ github.com/Nvveen/Gotty a8b993ba6abdb0e0c12b0125c603323a71c7790c https://github.
github.com/docker/go-metrics d466d4f6fd960e01820085bd7e1a24426ee7ef18

github.com/opencontainers/selinux b29023b86e4a69d1b46b7e7b4e2b6fda03f0b9cd


# archive/tar (for Go 1.10, see https://github.com/golang/go/issues/24787)
# mkdir -p ./vendor/archive
# git clone -b go-1.10 --depth=1 git@github.com:kolyshkin/go-tar.git ./vendor/archive/tar
# vndr # to clean up test files
27 changes: 0 additions & 27 deletions vendor/archive/tar/LICENSE

This file was deleted.

27 changes: 0 additions & 27 deletions vendor/archive/tar/README.md

This file was deleted.

0 comments on commit 10fd051

Please sign in to comment.