Преглед изворни кода

Merge pull request #10283 from rhatdan/dev

We want to allow the sharing of /dev from the host into the container.
Alexander Morozov пре 10 година
родитељ
комит
131b29f7bc
1 измењених фајлова са 4 додато и 0 уклоњено
  1. 4 0
      daemon/execdriver/native/create.go

+ 4 - 0
daemon/execdriver/native/create.go

@@ -220,8 +220,12 @@ func (d *driver) setupMounts(container *configs.Config, c *execdriver.Command) e
 
 	// Filter out mounts that are overriden by user supplied mounts
 	var defaultMounts []*configs.Mount
+	_, mountDev := userMounts["/dev"]
 	for _, m := range container.Mounts {
 		if _, ok := userMounts[m.Destination]; !ok {
+			if mountDev && strings.HasPrefix(m.Destination, "/dev/") {
+				continue
+			}
 			defaultMounts = append(defaultMounts, m)
 		}
 	}