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

fix bug in getRootResourcePath in previous commit

Browse source 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
This commit is contained in:
Tibor Vass 2014-05-28 16:12:29 -07:00
parent 5c069940db
commit 48907d57ed
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
daemon/container.go
View file

@ -163,26 +163,12 @@ func (container *Container) WriteHostConfig() error {
func (container *Container) getResourcePath(path string) (string, error) {
cleanPath := filepath.Join("/", path)
fullPath := filepath.Join(container.basefs, cleanPath)
result, err := symlink.FollowSymlinkInScope(fullPath, container.basefs)
if err != nil {
return "", err
}
return result, nil
return symlink.FollowSymlinkInScope(filepath.Join(container.basefs, cleanPath), container.basefs)
}
func (container *Container) getRootResourcePath(path string) (string, error) {
cleanPath := filepath.Join("/", path)
fullPath := filepath.Join(container.root, cleanPath)
result, err := symlink.FollowSymlinkInScope(fullPath, container.basefs)
if err != nil {
return "", err
}
return result, nil
return symlink.FollowSymlinkInScope(filepath.Join(container.root, cleanPath), container.root)
}
func populateCommand(c *Container, env []string) error {