Forráskód Böngészése

fix bug in getRootResourcePath in previous commit

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Tibor Vass 11 éve
szülő
commit
48907d57ed
1 módosított fájl, 2 hozzáadás és 16 törlés
  1. 2 16
      daemon/container.go

+ 2 - 16
daemon/container.go

@@ -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 {