vendor: update containerd/cri, remove "docker/distribution" dependency
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
4
vendor/github.com/containerd/cri/pkg/server/sandbox_portforward_unix.go
generated
vendored
4
vendor/github.com/containerd/cri/pkg/server/sandbox_portforward_unix.go
generated
vendored
@@ -100,9 +100,9 @@ func (c *criService) portForward(ctx context.Context, id string, port int32, str
|
||||
return ctx.Err()
|
||||
}
|
||||
// give a chance to terminate gracefully or timeout
|
||||
// 0.5s is the default timeout used in socat
|
||||
// after 1s
|
||||
// https://linux.die.net/man/1/socat
|
||||
timeout := time.Duration(500) * time.Millisecond
|
||||
const timeout = time.Second
|
||||
select {
|
||||
case e := <-errCh:
|
||||
if errFwd == nil {
|
||||
|
||||
2
vendor/github.com/containerd/cri/pkg/store/image/image.go
generated
vendored
2
vendor/github.com/containerd/cri/pkg/store/image/image.go
generated
vendored
@@ -24,8 +24,8 @@ import (
|
||||
"github.com/containerd/containerd"
|
||||
"github.com/containerd/containerd/content"
|
||||
"github.com/containerd/containerd/errdefs"
|
||||
"github.com/docker/distribution/digestset"
|
||||
imagedigest "github.com/opencontainers/go-digest"
|
||||
"github.com/opencontainers/go-digest/digestset"
|
||||
imageidentity "github.com/opencontainers/image-spec/identity"
|
||||
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
3
vendor/github.com/containerd/cri/vendor.conf
generated
vendored
3
vendor/github.com/containerd/cri/vendor.conf
generated
vendored
@@ -1,5 +1,4 @@
|
||||
# cri dependencies
|
||||
github.com/docker/distribution 2461543d988979529609e8cb6fca9ca190dc48da # v2.7.1
|
||||
github.com/docker/docker 4634ce647cf2ce2c6031129ccd109e557244986f
|
||||
github.com/opencontainers/selinux 0d49ba2a6aae052c614dfe5de62a158711a6c461 # v1.5.1
|
||||
github.com/tchap/go-patricia 666120de432aea38ab06bd5c818f04f4129882c9 # v2.2.6
|
||||
@@ -35,7 +34,7 @@ github.com/konsorten/go-windows-terminal-sequences edb144dfd453055e1e49a3d8b410
|
||||
github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c # v1.0.1
|
||||
github.com/Microsoft/go-winio 6c72808b55902eae4c5943626030429ff20f3b63 # v0.4.14
|
||||
github.com/Microsoft/hcsshim 5bc557dd210ff2caf615e6e22d398123de77fc11 # v0.8.9
|
||||
github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7
|
||||
github.com/opencontainers/go-digest 28d3ccc31a47933556673856d9807b4ca436108e
|
||||
github.com/opencontainers/image-spec d60099175f88c47cd379c4738d158884749ed235 # v1.0.1
|
||||
github.com/opencontainers/runc dc9208a3303feef5b3839f4323d9beb36df0a9dd # v1.0.0-rc10
|
||||
github.com/opencontainers/runtime-spec c4ee7d12c742ffe806cd9350b6af3b4b19faed6f # v1.0.2
|
||||
|
||||
Reference in New Issue
Block a user