kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

expose unresolved path for volumes and resolve symlink in container.getResourcePath 

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
This commit is contained in:
Tibor Vass 2014-05-27 17:10:00 -07:00
parent def86d0cf4
commit 65d4047cb6
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/container.go
View File

@ -139,7 +139,11 @@ func (container *Container) WriteHostConfig() (err error) {
func (container *Container) getResourcePath(path string) string {
cleanPath := filepath.Join("/", path)
return filepath.Join(container.basefs, cleanPath)
result, err := symlink.FollowSymlinkInScope(filepath.Join(container.basefs, cleanPath), container.basefs)
if err != nil {
utils.Errorf("getResourcePath failed: %v", err)
}
return result
}
func (container *Container) getRootResourcePath(path string) string {

4
daemon/volumes.go
View File

@ -280,8 +280,8 @@ func initializeVolume(container *Container, volPath string, binds map[string]Bin
delete(container.VolumesRW, volPath)
}
container.Volumes[newVolPath] = destination
container.VolumesRW[newVolPath] = srcRW
container.Volumes[volPath] = destination
container.VolumesRW[volPath] = srcRW
if err := createIfNotExists(source, volIsDir); err != nil {
return err