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

Merge pull request #19155 from coolljt0725/create_cwd_on_create

Browse source 
Create the working directory on container creation
This commit is contained in:
David Calavera 2016-01-14 09:13:44 -08:00
commit a225e39667
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/create_unix.go
View file

@ -23,6 +23,10 @@ func (daemon *Daemon) createContainerPlatformSpecificSettings(container *contain
}
defer daemon.Unmount(container)
if err := container.SetupWorkingDirectory(); err != nil {
return err
}
for spec := range config.Volumes {
name := stringid.GenerateNonCryptoID()
destination := filepath.Clean(spec)

4
integration-cli/docker_cli_build_test.go
View file

@ -6170,8 +6170,8 @@ func (s *DockerSuite) TestBuildBuildTimeArgExpansion(c *check.C) {
if err != nil {
c.Fatal(err)
}
if res != wdVal {
c.Fatalf("Config.WorkingDir value mismatch. Expected: %s, got: %s", wdVal, res)
if res != filepath.Clean(wdVal) {
c.Fatalf("Config.WorkingDir value mismatch. Expected: %s, got: %s", filepath.Clean(wdVal), res)
}
err = inspectFieldAndMarshall(imgName, "Config.Env", &resArr)

8
integration-cli/docker_cli_create_test.go
View file

@ -415,3 +415,11 @@ func (s *DockerSuite) TestCreateStopSignal(c *check.C) {
c.Assert(res, checker.Contains, "9")
}
func (s *DockerSuite) TestCreateWithWorkdir(c *check.C) {
testRequires(c, DaemonIsLinux)
name := "foo"
dir := "/home/foo/bar"
dockerCmd(c, "create", "--name", name, "-w", dir, "busybox")
dockerCmd(c, "cp", fmt.Sprintf("%s:%s", name, dir), "/tmp")
}