chore(deps): bump github.com/containerd/containerd from 1.7.19 to 1.7.20 (#3257)
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.7.19 to 1.7.20. - [Release notes](https://github.com/containerd/containerd/releases) - [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md) - [Commits](https://github.com/containerd/containerd/compare/v1.7.19...v1.7.20) --- updated-dependencies: - dependency-name: github.com/containerd/containerd dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
parent
e5823bbb9c
commit
7a3b8c5970
2
go.mod
2
go.mod
|
|
@ -36,7 +36,7 @@ require (
|
|||
|
||||
require (
|
||||
github.com/GoogleCloudPlatform/docker-credential-gcr/v2 v2.1.22
|
||||
github.com/containerd/containerd v1.7.19
|
||||
github.com/containerd/containerd v1.7.20
|
||||
)
|
||||
|
||||
require github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
|
||||
|
|
|
|||
4
go.sum
4
go.sum
|
|
@ -144,8 +144,8 @@ github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoC
|
|||
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
|
||||
github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
|
||||
github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
|
||||
github.com/containerd/containerd v1.7.19 h1:/xQ4XRJ0tamDkdzrrBAUy/LE5nCcxFKdBm4EcPrSMEE=
|
||||
github.com/containerd/containerd v1.7.19/go.mod h1:h4FtNYUUMB4Phr6v+xG89RYKj9XccvbNSCKjdufCrkc=
|
||||
github.com/containerd/containerd v1.7.20 h1:Sl6jQYk3TRavaU83h66QMbI2Nqg9Jm6qzwX57Vsn1SQ=
|
||||
github.com/containerd/containerd v1.7.20/go.mod h1:52GsS5CwquuqPuLncsXwG0t2CiUce+KsNHJZQJvAgR0=
|
||||
github.com/containerd/containerd/api v1.7.19 h1:VWbJL+8Ap4Ju2mx9c9qS1uFSB1OVYr5JJrW2yT5vFoA=
|
||||
github.com/containerd/containerd/api v1.7.19/go.mod h1:fwGavl3LNwAV5ilJ0sbrABL44AQxmNjDRcwheXDb6Ig=
|
||||
github.com/containerd/continuity v0.4.3 h1:6HVkalIp+2u1ZLH1J/pYX2oBVXlJZvh1X1A7bEZ9Su8=
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ EOF
|
|||
config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
|
||||
sh.upload_path = "/tmp/vagrant-install-golang"
|
||||
sh.env = {
|
||||
'GO_VERSION': ENV['GO_VERSION'] || "1.21.11",
|
||||
'GO_VERSION': ENV['GO_VERSION'] || "1.21.12",
|
||||
}
|
||||
sh.inline = <<~SHELL
|
||||
#!/usr/bin/env bash
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@
|
|||
//
|
||||
// The functions ToGRPC and FromGRPC can be used to map server-side and
|
||||
// client-side errors to the correct types.
|
||||
//
|
||||
// Deprecated: use [github.com/containerd/errdefs].
|
||||
package errdefs
|
||||
|
||||
import (
|
||||
|
|
|
|||
|
|
@ -955,6 +955,11 @@ func WithCapabilities(caps []string) SpecOpts {
|
|||
s.Process.Capabilities.Bounding = caps
|
||||
s.Process.Capabilities.Effective = caps
|
||||
s.Process.Capabilities.Permitted = caps
|
||||
if len(caps) == 0 {
|
||||
s.Process.Capabilities.Inheritable = nil
|
||||
} else if len(s.Process.Capabilities.Inheritable) > 0 {
|
||||
filterCaps(&s.Process.Capabilities.Inheritable, caps)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
@ -980,6 +985,16 @@ func removeCap(caps *[]string, s string) {
|
|||
*caps = newcaps
|
||||
}
|
||||
|
||||
func filterCaps(caps *[]string, filters []string) {
|
||||
var newcaps []string
|
||||
for _, c := range *caps {
|
||||
if capsContain(filters, c) {
|
||||
newcaps = append(newcaps, c)
|
||||
}
|
||||
}
|
||||
*caps = newcaps
|
||||
}
|
||||
|
||||
// WithAddedCapabilities adds the provided capabilities
|
||||
func WithAddedCapabilities(caps []string) SpecOpts {
|
||||
return func(_ context.Context, _ Client, _ *containers.Container, s *Spec) error {
|
||||
|
|
@ -1008,6 +1023,7 @@ func WithDroppedCapabilities(caps []string) SpecOpts {
|
|||
&s.Process.Capabilities.Bounding,
|
||||
&s.Process.Capabilities.Effective,
|
||||
&s.Process.Capabilities.Permitted,
|
||||
&s.Process.Capabilities.Inheritable,
|
||||
} {
|
||||
removeCap(cl, c)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ var (
|
|||
Package = "github.com/containerd/containerd"
|
||||
|
||||
// Version holds the complete version number. Filled in at linking time.
|
||||
Version = "1.7.19+unknown"
|
||||
Version = "1.7.20+unknown"
|
||||
|
||||
// Revision is filled with the VCS (e.g. git) revision being used to build
|
||||
// the program at linking time.
|
||||
|
|
|
|||
|
|
@ -370,7 +370,7 @@ github.com/cloudflare/circl/sign/ed448
|
|||
# github.com/containerd/cgroups v1.1.0
|
||||
## explicit; go 1.17
|
||||
github.com/containerd/cgroups/stats/v1
|
||||
# github.com/containerd/containerd v1.7.19
|
||||
# github.com/containerd/containerd v1.7.20
|
||||
## explicit; go 1.21
|
||||
github.com/containerd/containerd
|
||||
github.com/containerd/containerd/archive
|
||||
|
|
|
|||
Loading…
Reference in New Issue