github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fix package alias

Browse Source 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
Maksym Pavlenko 2021-11-10 14:29:41 -08:00
parent 6870f3b1b8
commit e17fe37e01
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/v2/manager.go
View File

@ -34,7 +34,7 @@ import (
"github.com/containerd/containerd/platforms" "github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/plugin" "github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/runtime" "github.com/containerd/containerd/runtime"
shim_binary "github.com/containerd/containerd/runtime/v2/shim" shimbinary "github.com/containerd/containerd/runtime/v2/shim"
"github.com/containerd/containerd/runtime/v2/task" "github.com/containerd/containerd/runtime/v2/task"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -304,7 +304,7 @@ func (m *ShimManager) resolveRuntimePath(runtime string) (string, error) {
// Preserve existing logic and resolve runtime path from runtime name. // Preserve existing logic and resolve runtime path from runtime name.
name := shim_binary.BinaryName(runtime) name := shimbinary.BinaryName(runtime)
if name == "" { if name == "" {
return "", fmt.Errorf("invalid runtime name %s, correct runtime name should be either format like `io.containerd.runc.v1` or a full path to the binary", runtime) return "", fmt.Errorf("invalid runtime name %s, correct runtime name should be either format like `io.containerd.runc.v1` or a full path to the binary", runtime)
} }
@ -318,7 +318,7 @@ func (m *ShimManager) resolveRuntimePath(runtime string) (string, error) {
lerr error lerr error
) )
binaryPath := shim_binary.BinaryPath(runtime) binaryPath := shimbinary.BinaryPath(runtime)
if _, serr := os.Stat(binaryPath); serr == nil { if _, serr := os.Stat(binaryPath); serr == nil {
cmdPath = binaryPath cmdPath = binaryPath
} }