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

Merge pull request #6646 from tiborvass/fix-workdir 

Fix --workdir=/
This commit is contained in:
Michael Crosby 2014-06-25 15:19:51 -07:00
parent 94370add05 baacc7006b
commit d91b8bcf0b
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
integration-cli/docker_cli_run_test.go
View File

@ -946,3 +946,17 @@ func TestModeHostname(t *testing.T) {
logDone("run - hostname and several network modes") logDone("run - hostname and several network modes")
} }
func TestRootWorkdir(t *testing.T) {
s, _, err := cmd(t, "run", "--workdir", "/", "busybox", "pwd")
if err != nil {
t.Fatal(s, err)
}
if s != "/\n" {
t.Fatalf("pwd returned '%s' (expected /\\n)", s)
}
deleteAllContainers()
logDone("run - workdir /")
}

8
pkg/symlink/fs.go
View File

@ -13,8 +13,6 @@ const maxLoopCounter = 100
// FollowSymlink will follow an existing link and scope it to the root // FollowSymlink will follow an existing link and scope it to the root
// path provided. // path provided.
func FollowSymlinkInScope(link, root string) (string, error) { func FollowSymlinkInScope(link, root string) (string, error) {
prev := "/"
root, err := filepath.Abs(root) root, err := filepath.Abs(root)
if err != nil { if err != nil {
return "", err return "", err
@ -25,10 +23,16 @@ func FollowSymlinkInScope(link, root string) (string, error) {
return "", err return "", err
} }
if link == root {
return root, nil
}
if !strings.HasPrefix(filepath.Dir(link), root) { if !strings.HasPrefix(filepath.Dir(link), root) {
return "", fmt.Errorf("%s is not within %s", link, root) return "", fmt.Errorf("%s is not within %s", link, root)
} }
prev := "/"
for _, p := range strings.Split(link, "/") { for _, p := range strings.Split(link, "/") {
prev = filepath.Join(prev, p) prev = filepath.Join(prev, p)
prev = filepath.Clean(prev) prev = filepath.Clean(prev)