vendor: github.com/containerd/containerd v1.6.2
includes a fix for CVE-2022-24769. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
e69529c94a
commit
ec221d6881
|
@ -18,7 +18,7 @@ require (
|
||||||
github.com/bsphere/le_go v0.0.0-20170215134836-7a984a84b549
|
github.com/bsphere/le_go v0.0.0-20170215134836-7a984a84b549
|
||||||
github.com/cloudflare/cfssl v0.0.0-20180323000720-5d63dbd981b5
|
github.com/cloudflare/cfssl v0.0.0-20180323000720-5d63dbd981b5
|
||||||
github.com/containerd/cgroups v1.0.3
|
github.com/containerd/cgroups v1.0.3
|
||||||
github.com/containerd/containerd v1.6.1
|
github.com/containerd/containerd v1.6.2
|
||||||
github.com/containerd/continuity v0.2.2
|
github.com/containerd/continuity v0.2.2
|
||||||
github.com/containerd/fifo v1.0.0
|
github.com/containerd/fifo v1.0.0
|
||||||
github.com/containerd/typeurl v1.0.2
|
github.com/containerd/typeurl v1.0.2
|
||||||
|
|
|
@ -232,8 +232,9 @@ github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoT
|
||||||
github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g=
|
github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g=
|
||||||
github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c=
|
github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c=
|
||||||
github.com/containerd/containerd v1.5.8/go.mod h1:YdFSv5bTFLpG2HIYmfqDpSYYTDX+mc5qtSuYx1YUb/s=
|
github.com/containerd/containerd v1.5.8/go.mod h1:YdFSv5bTFLpG2HIYmfqDpSYYTDX+mc5qtSuYx1YUb/s=
|
||||||
github.com/containerd/containerd v1.6.1 h1:oa2uY0/0G+JX4X7hpGCYvkp9FjUancz56kSNnb1sG3o=
|
|
||||||
github.com/containerd/containerd v1.6.1/go.mod h1:1nJz5xCZPusx6jJU8Frfct988y0NpumIq9ODB0kLtoE=
|
github.com/containerd/containerd v1.6.1/go.mod h1:1nJz5xCZPusx6jJU8Frfct988y0NpumIq9ODB0kLtoE=
|
||||||
|
github.com/containerd/containerd v1.6.2 h1:pcaPUGbYW8kBw6OgIZwIVIeEhdWVrBzsoCfVJ5BjrLU=
|
||||||
|
github.com/containerd/containerd v1.6.2/go.mod h1:sidY30/InSE1j2vdD1ihtKoJz+lWdaXMdiAeIupaf+s=
|
||||||
github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
|
github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
|
||||||
github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
|
github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
|
||||||
github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
|
github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
|
||||||
|
|
|
@ -77,7 +77,7 @@ Vagrant.configure("2") do |config|
|
||||||
config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
|
config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
|
||||||
sh.upload_path = "/tmp/vagrant-install-golang"
|
sh.upload_path = "/tmp/vagrant-install-golang"
|
||||||
sh.env = {
|
sh.env = {
|
||||||
'GO_VERSION': ENV['GO_VERSION'] || "1.17.7",
|
'GO_VERSION': ENV['GO_VERSION'] || "1.17.8",
|
||||||
}
|
}
|
||||||
sh.inline = <<~SHELL
|
sh.inline = <<~SHELL
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
|
@ -148,10 +148,9 @@ func populateDefaultUnixSpec(ctx context.Context, s *Spec, id string) error {
|
||||||
GID: 0,
|
GID: 0,
|
||||||
},
|
},
|
||||||
Capabilities: &specs.LinuxCapabilities{
|
Capabilities: &specs.LinuxCapabilities{
|
||||||
Bounding: defaultUnixCaps(),
|
Bounding: defaultUnixCaps(),
|
||||||
Permitted: defaultUnixCaps(),
|
Permitted: defaultUnixCaps(),
|
||||||
Inheritable: defaultUnixCaps(),
|
Effective: defaultUnixCaps(),
|
||||||
Effective: defaultUnixCaps(),
|
|
||||||
},
|
},
|
||||||
Rlimits: []specs.POSIXRlimit{
|
Rlimits: []specs.POSIXRlimit{
|
||||||
{
|
{
|
||||||
|
|
|
@ -810,7 +810,6 @@ func WithCapabilities(caps []string) SpecOpts {
|
||||||
s.Process.Capabilities.Bounding = caps
|
s.Process.Capabilities.Bounding = caps
|
||||||
s.Process.Capabilities.Effective = caps
|
s.Process.Capabilities.Effective = caps
|
||||||
s.Process.Capabilities.Permitted = caps
|
s.Process.Capabilities.Permitted = caps
|
||||||
s.Process.Capabilities.Inheritable = caps
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
@ -845,7 +844,6 @@ func WithAddedCapabilities(caps []string) SpecOpts {
|
||||||
&s.Process.Capabilities.Bounding,
|
&s.Process.Capabilities.Bounding,
|
||||||
&s.Process.Capabilities.Effective,
|
&s.Process.Capabilities.Effective,
|
||||||
&s.Process.Capabilities.Permitted,
|
&s.Process.Capabilities.Permitted,
|
||||||
&s.Process.Capabilities.Inheritable,
|
|
||||||
} {
|
} {
|
||||||
if !capsContain(*cl, c) {
|
if !capsContain(*cl, c) {
|
||||||
*cl = append(*cl, c)
|
*cl = append(*cl, c)
|
||||||
|
@ -865,7 +863,6 @@ func WithDroppedCapabilities(caps []string) SpecOpts {
|
||||||
&s.Process.Capabilities.Bounding,
|
&s.Process.Capabilities.Bounding,
|
||||||
&s.Process.Capabilities.Effective,
|
&s.Process.Capabilities.Effective,
|
||||||
&s.Process.Capabilities.Permitted,
|
&s.Process.Capabilities.Permitted,
|
||||||
&s.Process.Capabilities.Inheritable,
|
|
||||||
} {
|
} {
|
||||||
removeCap(cl, c)
|
removeCap(cl, c)
|
||||||
}
|
}
|
||||||
|
@ -880,7 +877,7 @@ func WithDroppedCapabilities(caps []string) SpecOpts {
|
||||||
func WithAmbientCapabilities(caps []string) SpecOpts {
|
func WithAmbientCapabilities(caps []string) SpecOpts {
|
||||||
return func(_ context.Context, _ Client, _ *containers.Container, s *Spec) error {
|
return func(_ context.Context, _ Client, _ *containers.Container, s *Spec) error {
|
||||||
setCapabilities(s)
|
setCapabilities(s)
|
||||||
|
s.Process.Capabilities.Inheritable = caps
|
||||||
s.Process.Capabilities.Ambient = caps
|
s.Process.Capabilities.Ambient = caps
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,7 @@ var (
|
||||||
Package = "github.com/containerd/containerd"
|
Package = "github.com/containerd/containerd"
|
||||||
|
|
||||||
// Version holds the complete version number. Filled in at linking time.
|
// Version holds the complete version number. Filled in at linking time.
|
||||||
Version = "1.6.1+unknown"
|
Version = "1.6.2+unknown"
|
||||||
|
|
||||||
// Revision is filled with the VCS (e.g. git) revision being used to build
|
// Revision is filled with the VCS (e.g. git) revision being used to build
|
||||||
// the program at linking time.
|
// the program at linking time.
|
||||||
|
|
|
@ -153,8 +153,8 @@ github.com/containerd/cgroups/v2/stats
|
||||||
# github.com/containerd/console v1.0.3
|
# github.com/containerd/console v1.0.3
|
||||||
## explicit; go 1.13
|
## explicit; go 1.13
|
||||||
github.com/containerd/console
|
github.com/containerd/console
|
||||||
# github.com/containerd/containerd v1.6.1
|
# github.com/containerd/containerd v1.6.2
|
||||||
## explicit; go 1.16
|
## explicit; go 1.17
|
||||||
github.com/containerd/containerd
|
github.com/containerd/containerd
|
||||||
github.com/containerd/containerd/api/events
|
github.com/containerd/containerd/api/events
|
||||||
github.com/containerd/containerd/api/services/containers/v1
|
github.com/containerd/containerd/api/services/containers/v1
|
||||||
|
|
Loading…
Reference in New Issue