Signed-off-by: Phil Estes <estesp@amazon.com>
(cherry picked from commit edfd8d5)

[release/1.4] cherry-pick: Change Wrapf of non-error to an actual error

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
(cherry picked from commit 014748b)

[release/1.4] cherry pick #5565 to release 1.4 - fix invalid validation error checking

Diff: containerd/cri@1360416...3b02bec

Signed-off-by: Wei Fu <fuweid89@gmail.com>

[release/1.4] vendor: update cri plugin with 3b02bec1603179debe2cde54509b2bfc45fc27d3

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit 28bb59c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

go1.15.13 (released 2021-06-03) includes security fixes to the archive/zip, math/big,
net, and net/http/httputil packages, as well as bug fixes to the linker, the go
command, and the math/big and net/http packages. See the Go 1.15.13 milestone on
the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.15.13+label%3ACherryPickApproved

go1.15.12 (released 2021-05-06) includes a security fix to the net/http package,
as well as bug fixes to the runtime, the compiler, and the archive/zip, time,
and syscall packages. See the Go 1.15.12 milestone on the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.15.12+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

[release/1.4] Update Go to 1.15.13

[release/1.4] update runc binary to v1.0.0 GA

> note: This is a slightly modified version of the commit in main, because
> pusher.Commit() uses a regular http.Response, not a wrapped one.

Discovered this while using HTTP tracing via OpenTelemetry inside of
buildkitd, where the trace spans were not being reported for the
registry PUT http requests.  The spans are only reported on the Close
for the Body, after adding these Close calls, the spans are reported as
expected.

Signed-off-by: coryb <cbennett@netflix.com>
(cherry picked from commit 894b6ae)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

…e_body

[release/1.4 backport] Fix missing Body.Close() calls on push to docker remote

Release note: Release notes: https://golang.org/doc/devel/release#go1.15

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

[release/1.4] Update Go to 1.15.14

Signed-off-by: Derek McGowan <derek@mcg.dev>

Signed-off-by: Derek McGowan <derek@mcg.dev>

[release/1.4] prepare release notes for 1.4.7