Merge component 'engine' from [email protected]:moby/moby master

cemckenzie · Oct 1, 2020 · 12be691 · 12be691
2 parents 2f656f1 + e9585b7
commit 12be691
Show file tree

Hide file tree

Showing 15 changed files with 174 additions and 134 deletions.
diff --git a/components/engine/api/server/router/container/container.go b/components/engine/api/server/router/container/container.go
@@ -10,13 +10,15 @@ type containerRouter struct {
 	backend Backend
 	decoder httputils.ContainerDecoder
 	routes  []router.Route
+	cgroup2 bool
 }
 
 // NewRouter initializes a new container router
-func NewRouter(b Backend, decoder httputils.ContainerDecoder) router.Router {
+func NewRouter(b Backend, decoder httputils.ContainerDecoder, cgroup2 bool) router.Router {
 	r := &containerRouter{
 		backend: b,
 		decoder: decoder,
+		cgroup2: cgroup2,
 	}
 	r.initRoutes()
 	return r

diff --git a/components/engine/api/server/router/container/container_routes.go b/components/engine/api/server/router/container/container_routes.go
@@ -494,8 +494,8 @@ func (s *containerRouter) postContainersCreate(ctx context.Context, w http.Respo
 			hostConfig.IpcMode = container.IpcMode("shareable")
 		}
 	}
-	if hostConfig != nil && versions.LessThan(version, "1.41") {
-		// Older clients expect the default to be "host"
+	if hostConfig != nil && versions.LessThan(version, "1.41") && !s.cgroup2 {
+		// Older clients expect the default to be "host" on cgroup v1 hosts
 		if hostConfig.CgroupnsMode.IsEmpty() {
 			hostConfig.CgroupnsMode = container.CgroupnsMode("host")
 		}

diff --git a/components/engine/cmd/dockerd/daemon.go b/components/engine/cmd/dockerd/daemon.go
@@ -477,7 +477,7 @@ func initRouter(opts routerOptions) {
 	routers := []router.Router{
 		// we need to add the checkpoint router before the container router or the DELETE gets masked
 		checkpointrouter.NewRouter(opts.daemon, decoder),
-		container.NewRouter(opts.daemon, decoder),
+		container.NewRouter(opts.daemon, decoder, opts.daemon.RawSysInfo(true).CgroupUnified),
 		image.NewRouter(opts.daemon.ImageService()),
 		systemrouter.NewRouter(opts.daemon, opts.cluster, opts.buildkit, opts.features),
 		volume.NewRouter(opts.daemon.VolumesService()),

diff --git a/components/engine/vendor.conf b/components/engine/vendor.conf
@@ -10,8 +10,7 @@ github.com/moby/locker                              281af2d563954745bea9d1487c96
 github.com/moby/term                                7f0af18e79f2784809e9cef63d0df5aa2c79d76e
 
 github.com/creack/pty                               3a6a957789163cacdfe0e291617a1c8e80612c11 # v1.1.9
-github.com/konsorten/go-windows-terminal-sequences  edb144dfd453055e1e49a3d8b410a660b5a87613 # v1.0.3
-github.com/sirupsen/logrus                          60c74ad9be0d874af0ab0daef6ab07c5c5911f0d # v1.6.0
+github.com/sirupsen/logrus                          6699a89a232f3db797f2e280639854bbc4b89725 # v1.7.0
 github.com/tchap/go-patricia                        a7f0089c6f496e8e70402f61733606daa326cac5 # v2.3.0
 golang.org/x/net                                    ab34263943818b32f575efc978a3d24e80b04bd7
 golang.org/x/sys                                    aee5d888a86055dc6ab0342f9cdc7b53aaeaec62

diff --git a/components/engine/vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE b/components/engine/vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE
diff --git a/...ents/engine/vendor/github.com/konsorten/go-windows-terminal-sequences/README.md b/...ents/engine/vendor/github.com/konsorten/go-windows-terminal-sequences/README.md
diff --git a/components/engine/vendor/github.com/konsorten/go-windows-terminal-sequences/go.mod b/components/engine/vendor/github.com/konsorten/go-windows-terminal-sequences/go.mod
diff --git a/components/engine/vendor/github.com/konsorten/go-windows-terminal-sequences/sequences.go b/components/engine/vendor/github.com/konsorten/go-windows-terminal-sequences/sequences.go
diff --git a/...nents/engine/vendor/github.com/konsorten/go-windows-terminal-sequences/sequences_dummy.go b/...nents/engine/vendor/github.com/konsorten/go-windows-terminal-sequences/sequences_dummy.go
diff --git a/components/engine/vendor/github.com/sirupsen/logrus/buffer_pool.go b/components/engine/vendor/github.com/sirupsen/logrus/buffer_pool.go
diff --git a/components/engine/vendor/github.com/sirupsen/logrus/entry.go b/components/engine/vendor/github.com/sirupsen/logrus/entry.go
diff --git a/components/engine/vendor/github.com/sirupsen/logrus/exported.go b/components/engine/vendor/github.com/sirupsen/logrus/exported.go
diff --git a/components/engine/vendor/github.com/sirupsen/logrus/go.mod b/components/engine/vendor/github.com/sirupsen/logrus/go.mod
diff --git a/components/engine/vendor/github.com/sirupsen/logrus/logger.go b/components/engine/vendor/github.com/sirupsen/logrus/logger.go