From 08ddbfbdac52d4e7122045a76f805dd4dba078ad Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 19 Mar 2021 11:56:41 +0100 Subject: libcontainerd: remove LCOW bits Signed-off-by: Sebastiaan van Stijn --- daemon/start_windows.go | 35 +++-------------------------------- 1 file changed, 3 insertions(+), 32 deletions(-) (limited to 'daemon/start_windows.go') diff --git a/daemon/start_windows.go b/daemon/start_windows.go index d21fec5d70..5d01b84df5 100644 --- a/daemon/start_windows.go +++ b/daemon/start_windows.go @@ -2,43 +2,14 @@ package daemon // import "github.com/docker/docker/daemon" import ( "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options" - "github.com/Microsoft/opengcs/client" "github.com/docker/docker/container" "github.com/docker/docker/pkg/system" ) -func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Container) (string, interface{}, error) { - - // Set the runtime options to debug regardless of current logging level. +func (daemon *Daemon) getLibcontainerdCreateOptions(_ *container.Container) (string, interface{}, error) { if system.ContainerdRuntimeSupported() { - opts := &options.Options{Debug: true} - return "", opts, nil - } - - // TODO (containerd) - Probably need to revisit LCOW options here - // rather than blindly ignoring them. - - // LCOW options. - if container.OS == "linux" { - config := &client.Config{} - if err := config.GenerateDefault(daemon.configStore.GraphOptions); err != nil { - return "", nil, err - } - // Override from user-supplied options. - for k, v := range container.HostConfig.StorageOpt { - switch k { - case "lcow.kirdpath": - config.KirdPath = v - case "lcow.bootparameters": - config.BootParameters = v - } - } - if err := config.Validate(); err != nil { - return "", nil, err - } - - return "", config, nil + // Set the runtime options to debug regardless of current logging level. + return "", &options.Options{Debug: true}, nil } - return "", nil, nil } -- cgit v1.2.1