docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10283 from rhatdan/dev 

We want to allow the sharing of /dev from the host into the container.
This commit is contained in:
Alexander Morozov 2015-03-24 12:57:44 -07:00
parent f7900cdd67 fe9fe1473c
commit 131b29f7bc
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/execdriver/native/create.go
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 // Filter out mounts that are overriden by user supplied mounts
var defaultMounts []*configs.Mount var defaultMounts []*configs.Mount
_, mountDev := userMounts["/dev"]
for _, m := range container.Mounts { for _, m := range container.Mounts {
if _, ok := userMounts[m.Destination]; !ok { if _, ok := userMounts[m.Destination]; !ok {
if mountDev && strings.HasPrefix(m.Destination, "/dev/") {
continue
}
defaultMounts = append(defaultMounts, m) defaultMounts = append(defaultMounts, m)
} }
} }