Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[18.09 backport] Bump Golang to 1.11.11 #168

Merged
merged 18 commits into from
Jul 23, 2019
Merged

[18.09 backport] Bump Golang to 1.11.11 #168

merged 18 commits into from
Jul 23, 2019

Commits on Jun 20, 2019

  1. Format code with gofmt -s from go-1.11beta1 

    This should eliminate a bunch of new (go-1.11 related) validation
errors telling that the code is not formatted with `gofmt -s`.

No functional change, just whitespace (i.e.
`git show --ignore-space-change` shows nothing).

Patch generated with:

> git ls-files | grep -v ^vendor/ | grep .go$ | xargs gofmt -s -w

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 9b0097a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @kolyshkin @thaJeztah
    kolyshkin authored and thaJeztah committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    ee28567 View commit details
    Browse the repository at this point in the history

  2. Revendor ugorji/go 

    To include the following backported fix:

kolyshkin/ugorji-go@1cf431c13dec46596

which should fix this:

> 13:40:53 vendor/github.com/ugorji/go/codec/gen-helper.generated.go:1:
> possible malformed +build comment%!(EXTRA []interface {}=[])

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 09921ca)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @kolyshkin @thaJeztah
    kolyshkin authored and thaJeztah committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    ca9d80e View commit details
    Browse the repository at this point in the history

  3. Dockerfile.simple: simplify by using golang img 

    Instead of installing golang from sources, it's easier to use
golang image which is based on Debian Stretch.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 32a2331)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @kolyshkin @thaJeztah
    kolyshkin authored and thaJeztah committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    2e82d41 View commit details
    Browse the repository at this point in the history

  4. hack/make.ps1: remove the .0 suffix from go version 

    We would like to use a version with .0 suffix (like 1.11.0) in
Dockerfile, so that once a .1 version is out (like 1.11.1) we
won't accidentally switch to it.

Unfortunately it's not possible to use .0 suffix currently
as it breaks the check in make.ps1. This patch fixes that.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 8ad648b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @kolyshkin @thaJeztah
    kolyshkin authored and thaJeztah committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    dc5371b View commit details
    Browse the repository at this point in the history

  5. 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 <kolyshkin@gmail.com>
(cherry picked from commit 10fd051)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @kolyshkin @thaJeztah
    kolyshkin authored and thaJeztah committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    ebf3960 View commit details
    Browse the repository at this point in the history

  6. Bump vndr 

    We can do that now as we're no longer carrying archive/tar.
Note that latest vndr removes vendor/ subdir so we don't have to,
thus the change in hack/validate/vendor.

While at it, re-run a new vndr version to make sure everything
that should be there is.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit ce858fe)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @kolyshkin @thaJeztah
    kolyshkin authored and thaJeztah committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    2f2588f View commit details
    Browse the repository at this point in the history

  7. vendor: bump etcd to v3.3.9 

    ...and use ugorji/go 1.1.1

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit a77a2a4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @kolyshkin @thaJeztah
    kolyshkin authored and thaJeztah committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    a1e8eee View commit details
    Browse the repository at this point in the history

  8. vendor: bump etcd deps 

    As per https://github.com/etcd-io/etcd/blob/fa57f7fbc787b4/Gopkg.lock

List of packages required by subset of etcd used is provided by:

go list -f '{{join .Deps "\n"}}' \
 github.com/docker/docker/vendor/github.com/coreos/etcd/... \
 | grep -F . | grep -v coreos/etcd | sort | uniq

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 7008ac0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @kolyshkin @thaJeztah
    kolyshkin authored and thaJeztah committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    c4bf080 View commit details
    Browse the repository at this point in the history

  9. Bump Golang 1.11.1 

    go1.11.1 (released 2018/10/01) includes fixes to the compiler,
documentation, go command, runtime, and the crypto/x509, encoding/json,
go/types, net, net/http, and reflect packages.

See the Go 1.11.1 milestone on our issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.11.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0347751)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    6b397d1 View commit details
    Browse the repository at this point in the history

  10. Bump Golang to 1.11.2 

    Includes fixes to the compiler, linker, documentation, go command, and the
database/sql and go/types packages. See the Go 1.11.2 milestone on the issue
tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.11.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit e80ee52)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    f9a71f9 View commit details
    Browse the repository at this point in the history

  11. Bump Golang 1.11.3 (CVE-2018-16875) 

    go1.11.13 (released 2018/12/14)

- crypto/x509: CPU denial of service in chain validation golang/go#29233
- cmd/go: directory traversal in "go get" via curly braces in import paths golang/go#29231
- cmd/go: remote command execution during "go get -u" golang/go#29230

See the Go 1.11.3 milestone on the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.11.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 6b7c093)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    19d37c9 View commit details
    Browse the repository at this point in the history

  12. Bump Golang 1.11.4 

    go1.11.4 (released 2018/12/14) includes fixes to cgo, the compiler, linker,
runtime, documentation, go command, and the net/http and go/types packages. It
includes a fix to a bug introduced in Go 1.11.3 that broke go get for import
path patterns containing "...".

See the Go 1.11.4 milestone for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.11.4+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 3770f38)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    e05367a View commit details
    Browse the repository at this point in the history

  13. Switch Dockerfile.e2e to alpine 3.8 

    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 7c8dceb)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    1514816 View commit details
    Browse the repository at this point in the history

  14. Bump Golang 1.11.5 (CVE-2019-6486) 

    See the milestone for details;
https://github.com/golang/go/issues?q=milestone%3AGo1.11.5+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 20b3441)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    4add22c View commit details
    Browse the repository at this point in the history

  15. Bump Golang 1.11.9 

    Full diff: golang/go@go1.11.5...go1.11.9

go1.11.6 (released 2019/03/14) includes fixes to cgo, the compiler, linker,
runtime, go command, and the crypto/x509, encoding/json, net, and net/url
packages. See the Go 1.11.6 milestone on our issue tracker for details.

https://github.com/golang/go/issues?q=milestone%3AGo1.11.6

go1.11.7 (released 2019/04/05) includes fixes to the runtime and the net
packages. See the Go 1.11.7 milestone on our issue tracker for details.

https://github.com/golang/go/issues?q=milestone%3AGo1.11.7

go1.11.8 (released 2019/04/08) was accidentally released without its
intended fix. It is identical to go1.11.7, except for its version number.
The intended fix is in go1.11.9.

go1.11.9 (released 2019/04/11) fixes an issue where using the prebuilt
binary releases on older versions of GNU/Linux led to failures when linking
programs that used cgo. Only Linux users who hit this issue need to update.

See golang/go#31293 for details

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    2cc1df0 View commit details
    Browse the repository at this point in the history

  16. Dockerfile.e2e bump alpine 3.9 

    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    eaa4fa9 View commit details
    Browse the repository at this point in the history

  17. Bump Golang 1.11.10 

    go1.11.10 (released 2019/05/06) includes fixes to the runtime and the linker.
See the Go 1.11.10 milestone on our issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.11.10

Full diff: golang/go@go1.11.9...go1.11.10

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    79ae84c View commit details
    Browse the repository at this point in the history

  18. Bump golang 1.11.11 

    go1.11.11 (released 2019/06/11) includes a fix to the crypto/x509 package.
See the Go 1.11.11 milestone on the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.11.11

full diff: golang/go@go1.11.10...go1.11.11

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    a14e6ca View commit details
    Browse the repository at this point in the history