toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Label standard mounts within loop

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 305e9cd2fab974c38064a1acd2ef1f552a3a1357
Component: engine
This commit is contained in:
Michael Crosby
2014-12-01 14:54:14 -05:00
parent 0896bd3b29
commit e178f59d16
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/volumes.go
+5 -8
View File
@@ -236,25 +236,22 @@ func validMountMode(mode string) bool {
}
func (container *Container) setupMounts() error {
if err := label.SetFileLabel(container.ResolvConfPath, container.MountLabel); err != nil {
return err
}
mounts := []execdriver.Mount{
{Source: container.ResolvConfPath, Destination: "/etc/resolv.conf", Writable: true, Private: true},
}
if container.HostnamePath != "" {
if err := label.SetFileLabel(container.HostnamePath, container.MountLabel); err != nil {
return err
}
mounts = append(mounts, execdriver.Mount{Source: container.HostnamePath, Destination: "/etc/hostname", Writable: true, Private: true})
}
if container.HostsPath != "" {
if err := label.SetFileLabel(container.HostsPath, container.MountLabel); err != nil {
mounts = append(mounts, execdriver.Mount{Source: container.HostsPath, Destination: "/etc/hosts", Writable: true, Private: true})
}
for _, m := range mounts {
if err := label.SetFileLabel(m.Source, container.MountLabel); err != nil {
return err
}
mounts = append(mounts, execdriver.Mount{Source: container.HostsPath, Destination: "/etc/hosts", Writable: true, Private: true})
}
// Mount user specified volumes