Send hcsshim's options struct when running with hcsshim

containerd-shim-runhcs-v1 does not know how to parse the default containerd runtimeoptions.v1.Options structure, and panics at startup. Signed-off-by: Paul "TBBle" Hampson <[email protected]>
moby · Oct 22, 2023 · c490b74 · c490b74
1 parent ab94d3b
commit c490b74
Show file tree

Hide file tree

Showing 6 changed files with 1,915 additions and 0 deletions.
diff --git a/cmd/buildkitd/main_containerd_worker.go b/cmd/buildkitd/main_containerd_worker.go
@@ -11,6 +11,7 @@ import (
 	"strings"
 	"time"
 
+	runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
 	ctd "github.com/containerd/containerd"
 	"github.com/containerd/containerd/defaults"
 	runtimeoptions "github.com/containerd/containerd/pkg/runtimeoptions/v1"
@@ -32,6 +33,9 @@ import (
 
 const (
 	defaultContainerdNamespace = "buildkit"
+
+	// runtimeRunhcsV1 is the runtime type for runhcs.
+	runtimeRunhcsV1 = "io.containerd.runhcs.v1"
 )
 
 func init() {
@@ -372,6 +376,8 @@ func getRuntimeOptionsType(t string) interface{} {
 	switch t {
 	case plugin.RuntimeRuncV2:
 		return &runcoptions.Options{}
+	case runtimeRunhcsV1:
+		return &runhcsoptions.Options{}
 	default:
 		return &runtimeoptions.Options{}
 	}

diff --git a/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/doc.go b/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/doc.go
diff --git a/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/next.pb.txt b/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/next.pb.txt