diff --git a/daemon/runtime_unix.go b/daemon/runtime_unix.go index 17e2b15d49..2f2011f2e3 100644 --- a/daemon/runtime_unix.go +++ b/daemon/runtime_unix.go @@ -15,7 +15,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/daemon/config" "github.com/docker/docker/pkg/ioutils" - "github.com/opencontainers/runc/libcontainer/cgroups" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) @@ -34,16 +33,9 @@ func configureRuntimes(conf *config.Config) { if conf.Runtimes == nil { conf.Runtimes = make(map[string]types.Runtime) } - conf.Runtimes[config.StockRuntimeName] = types.Runtime{Path: defaultRuntimeName, Shim: getShimConfig(conf, defaultRuntimeName)} conf.Runtimes[config.LinuxV1RuntimeName] = types.Runtime{Path: defaultRuntimeName, Shim: defaultV1ShimConfig(conf, defaultRuntimeName)} conf.Runtimes[config.LinuxV2RuntimeName] = types.Runtime{Path: defaultRuntimeName, Shim: defaultV2ShimConfig(conf, defaultRuntimeName)} -} - -func getShimConfig(conf *config.Config, runtimePath string) *types.ShimConfig { - if cgroups.IsCgroup2UnifiedMode() { - return defaultV2ShimConfig(conf, runtimePath) - } - return defaultV1ShimConfig(conf, runtimePath) + conf.Runtimes[config.StockRuntimeName] = conf.Runtimes[config.LinuxV2RuntimeName] } func defaultV2ShimConfig(conf *config.Config, runtimePath string) *types.ShimConfig { diff --git a/daemon/start_unix.go b/daemon/start_unix.go index 4373a97d83..b2908fbc17 100644 --- a/daemon/start_unix.go +++ b/daemon/start_unix.go @@ -24,7 +24,7 @@ func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Contain if err != nil { return "", nil, translateContainerdStartErr(container.Path, container.SetExitCode, err) } - rt.Shim = getShimConfig(daemon.configStore, p) + rt.Shim = defaultV2ShimConfig(daemon.configStore, p) } if rt.Shim.Binary == linuxShimV1 { if cgroups.IsCgroup2UnifiedMode() {