containerd/SOURCES/0002-Remove-windows-only-de...

24 lines
925 B
Diff

diff --color -Naur a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go
--- a/pkg/cri/server/helpers.go 2021-11-17 21:04:57.000000000 +0100
+++ b/pkg/cri/server/helpers.go 2021-11-22 22:39:01.743745977 +0100
@@ -39,7 +39,7 @@ import (
"github.com/containerd/typeurl"
"github.com/sirupsen/logrus"
- runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
+ // runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
imagedigest "github.com/opencontainers/go-digest"
"github.com/pelletier/go-toml"
"golang.org/x/net/context"
@@ -365,8 +365,8 @@ func getRuntimeOptionsType(t string) int
return &runcoptions.Options{}
case plugin.RuntimeLinuxV1:
return &runctypes.RuncOptions{}
- case runtimeRunhcsV1:
- return &runhcsoptions.Options{}
+ // case runtimeRunhcsV1:
+ // return &runhcsoptions.Options{}
default:
return &runtimeoptions.Options{}
}