@@ -54,8 +54,6 @@ import (

 	"github.com/docker/docker/pkg/pidfile"

 	"github.com/docker/docker/pkg/plugingetter"

 	"github.com/docker/docker/pkg/rootless"

-	"github.com/docker/docker/pkg/sysinfo"

-	"github.com/docker/docker/runconfig"

 	"github.com/docker/go-connections/tlsconfig"

 	"github.com/moby/buildkit/session"

 	"github.com/moby/buildkit/util/tracing/detect"

@@ -704,16 +702,10 @@ func normalizeHosts(cfg *config.Config) error {

 }

 func buildRouters(opts routerOptions) []router.Router {

-	decoder := runconfig.ContainerDecoder{

-		GetSysInfo: func() *sysinfo.SysInfo {

-			return opts.daemon.RawSysInfo()

-		},

-	}

-

 	routers := []router.Router{

 		// we need to add the checkpoint router before the container router or the DELETE gets masked

 		checkpointrouter.NewRouter(opts.daemon),

-		container.NewRouter(opts.daemon, decoder, opts.daemon.RawSysInfo().CgroupUnified),

+		container.NewRouter(opts.daemon, opts.daemon.RawSysInfo()),

 		image.NewRouter(

 			opts.daemon.ImageService(),

 			opts.daemon.RegistryService(),

deleted file mode 100644

@@ -1,15 +0,0 @@

-package httputils

-

-import (

-	"io"

-

-	"github.com/moby/moby/api/types/container"

-	"github.com/moby/moby/api/types/network"

-)

-

-// ContainerDecoder specifies how

-// to translate an io.Reader into

-// container configuration.

-type ContainerDecoder interface {

-	DecodeConfig(src io.Reader) (*container.Config, *container.HostConfig, *network.NetworkingConfig, error)

-}

@@ -1,24 +1,29 @@

 package container

 import (

-	"github.com/docker/docker/daemon/server/httputils"

 	"github.com/docker/docker/daemon/server/router"

+	"github.com/docker/docker/pkg/sysinfo"

+	"github.com/docker/docker/runconfig"

 )

 // containerRouter is a router to talk with the container controller

 type containerRouter struct {

 	backend Backend

-	decoder httputils.ContainerDecoder

+	decoder runconfig.ContainerDecoder

 	routes  []router.Route

 	cgroup2 bool

 }

 // NewRouter initializes a new container router

-func NewRouter(b Backend, decoder httputils.ContainerDecoder, cgroup2 bool) router.Router {

+func NewRouter(b Backend, sysInfo *sysinfo.SysInfo) router.Router {

 	r := &containerRouter{

 		backend: b,

-		decoder: decoder,

-		cgroup2: cgroup2,

+		decoder: runconfig.ContainerDecoder{

+			GetSysInfo: func() *sysinfo.SysInfo {

+				return sysInfo

+			},

+		},

+		cgroup2: sysInfo.CgroupUnified,

 	}

 	r.initRoutes()

 	return r