kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #14613 from stefanberger/nohidevols2

Browse source 
Do not hide user provided network mounts [v2]
This commit is contained in:
Brian Goff 2015-07-22 16:24:22 -04:00
commit d106a2ea2a
3 changed files with 49 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
daemon/container_unix.go
View file

@ -363,6 +363,26 @@ func (container *Container) GetSize() (int64, int64) {
return sizeRw, sizeRootfs
}
// Attempt to set the network mounts given a provided destination and
// the path to use for it; return true if the given destination was a
// network mount file
func (container *Container) trySetNetworkMount(destination string, path string) bool {
if destination == "/etc/resolv.conf" {
container.ResolvConfPath = path
return true
}
if destination == "/etc/hostname" {
container.HostnamePath = path
return true
}
if destination == "/etc/hosts" {
container.HostsPath = path
return true
}
return false
}
func (container *Container) buildHostnameFile() error {
hostnamePath, err := container.GetRootResourcePath("hostname")
if err != nil {