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 #17665 from LK4D4/setupwd_refactor

Browse source 
Reorder code slightly in setupWorkingDirectory
This commit is contained in:
Jess Frazelle 2015-11-03 15:56:10 -08:00
commit 562a1263f2
1 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

33
daemon/container_unix.go
View file

@ -1105,28 +1105,29 @@ func (container *Container) getIpcContainer() (*Container, error) {
} }
func (container *Container) setupWorkingDirectory() error { func (container *Container) setupWorkingDirectory() error {
if container.Config.WorkingDir != "" { if container.Config.WorkingDir == "" {
container.Config.WorkingDir = filepath.Clean(container.Config.WorkingDir) return nil
}
container.Config.WorkingDir = filepath.Clean(container.Config.WorkingDir)
pth, err := container.GetResourcePath(container.Config.WorkingDir) pth, err := container.GetResourcePath(container.Config.WorkingDir)
if err != nil { if err != nil {
return err
}
pthInfo, err := os.Stat(pth)
if err != nil {
if !os.IsNotExist(err) {
return err return err
} }
pthInfo, err := os.Stat(pth) if err := system.MkdirAll(pth, 0755); err != nil {
if err != nil { return err
if !os.IsNotExist(err) {
return err
}
if err := system.MkdirAll(pth, 0755); err != nil {
return err
}
}
if pthInfo != nil && !pthInfo.IsDir() {
return derr.ErrorCodeNotADir.WithArgs(container.Config.WorkingDir)
} }
} }
if pthInfo != nil && !pthInfo.IsDir() {
return derr.ErrorCodeNotADir.WithArgs(container.Config.WorkingDir)
}
return nil return nil
} }