beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Label content created for containers with the private label

Browse source 
Currently this content gets a system label and is not writable based on
SELinux controls.  This patch will set the labels to the correct label.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
This commit is contained in:
Dan Walsh 2014-11-20 17:20:26 -05:00
parent 7ebcdad030
commit 61b2766e75
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
daemon/volumes.go
View file

@ -15,6 +15,7 @@ import (
"github.com/docker/docker/pkg/chrootarchive"
"github.com/docker/docker/pkg/symlink"
"github.com/docker/docker/volumes"
"github.com/docker/libcontainer/label"
)
type Mount struct {
@ -235,15 +236,24 @@ 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 {
return err
}
mounts = append(mounts, execdriver.Mount{Source: container.HostsPath, Destination: "/etc/hosts", Writable: true, Private: true})
}