InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

vendor: github.com/containerd/containerd v1.7.25

Browse Source 
full diff: https://github.com/containerd/containerd/compare/v1.7.24...v1.7.25

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-01-10 10:28:48 +01:00
parent d80e3410bc
commit ad860173a2
32 changed files with 579 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/info_unix.go
View File

@@ -11,7 +11,7 @@ import (
"path/filepath"
"strings"
v2runcoptions "github.com/containerd/containerd/runtime/v2/runc/options"
runcoptions "github.com/containerd/containerd/api/types/runc/options"
"github.com/containerd/log"
"github.com/docker/docker/api/types"
containertypes "github.com/docker/docker/api/types/container"
@@ -387,7 +387,7 @@ func parseDefaultRuntimeVersion(rts *runtimes) (runtime, version, commit string,
if err != nil {
return "", "", "", err
}
shimopts, ok := opts.(*v2runcoptions.Options)
shimopts, ok := opts.(*runcoptions.Options)
if !ok {
return "", "", "", fmt.Errorf("%s: retrieving version not supported", shim)
}