Merge pull request #10283 from rhatdan/dev

We want to allow the sharing of /dev from the host into the container.
Upstream-commit: 131b29f7bc003ab6e6fc1d4e06fcf6764f4f7e6d
Component: engine
This commit is contained in:
Alexander Morozov
2015-03-24 12:57:44 -07:00

View File

@ -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)
}
}