Browse Source

Merge pull request #25660 from justincormack/no-fuse-dev

Do not create /dev/fuse by default
Tõnis Tiigi 9 năm trước cách đây
mục cha
commit
b08a1c3fe4
2 tập tin đã thay đổi với 1 bổ sung12 xóa
  1. 0 1
      integration-cli/docker_cli_diff_test.go
  2. 1 11
      oci/defaults_linux.go

+ 0 - 1
integration-cli/docker_cli_diff_test.go

@@ -61,7 +61,6 @@ func (s *DockerSuite) TestDiffEnsureDefaultDevs(c *check.C) {
 		"A /dev/mqueue":  true,
 		"A /dev/kmsg":    true,
 		"A /dev/fd":      true,
-		"A /dev/fuse":    true,
 		"A /dev/ptmx":    true,
 		"A /dev/null":    true,
 		"A /dev/random":  true,

+ 1 - 11
oci/defaults_linux.go

@@ -104,17 +104,7 @@ func DefaultSpec() specs.Spec {
 		// null, zero, full, random, urandom, tty, console, and ptmx.
 		// ptmx is a bind-mount or symlink of the container's ptmx.
 		// See also: https://github.com/opencontainers/runtime-spec/blob/master/config-linux.md#default-devices
-		Devices: []specs.Device{
-			{
-				Type:     "c",
-				Path:     "/dev/fuse",
-				Major:    10,
-				Minor:    229,
-				FileMode: fmPtr(0666),
-				UID:      u32Ptr(0),
-				GID:      u32Ptr(0),
-			},
-		},
+		Devices: []specs.Device{},
 		Resources: &specs.Resources{
 			Devices: []specs.DeviceCgroup{
 				{