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

Merge pull request #22069 from rhvgoyal/overlay-private 

Make overlay home dir Private mount
This commit is contained in:
Alexander Morozov 2016-04-18 14:56:34 -07:00
parent c3533d58c3 e076bccb45
commit 7f767d8ff5
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
daemon/graphdriver/overlay/overlay.go
View File

@ -19,6 +19,7 @@ import (
"github.com/docker/docker/pkg/chrootarchive" "github.com/docker/docker/pkg/chrootarchive"
"github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/idtools"
"github.com/docker/docker/pkg/mount"
"github.com/opencontainers/runc/libcontainer/label" "github.com/opencontainers/runc/libcontainer/label"
) )
@ -145,6 +146,10 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
return nil, err return nil, err
} }
if err := mount.MakePrivate(home); err != nil {
return nil, err
}
d := &Driver{ d := &Driver{
home: home, home: home,
pathCache: make(map[string]string), pathCache: make(map[string]string),
@ -217,10 +222,11 @@ func (d *Driver) GetMetadata(id string) (map[string]string, error) {
return metadata, nil return metadata, nil
} }
// Cleanup simply returns nil and do not change the existing filesystem. // Cleanup any state created by overlay which should be cleaned when daemon
// This is required to satisfy the graphdriver.Driver interface. // is being shutdown. For now, we just have to unmount the bind mounted
// we had created.
func (d *Driver) Cleanup() error { func (d *Driver) Cleanup() error {
return nil return mount.Unmount(d.home)
} }
// CreateReadWrite creates a layer that is writable for use as a container // CreateReadWrite creates a layer that is writable for use as a container