0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #16002 from Microsoft/10662-workdir-platformsemantics

Browse source 
Windows: Ensure workdir handled in platform semantics
This commit is contained in:
Jessie Frazelle 2015-09-02 16:09:35 -07:00
commit c6dd451073
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
daemon/daemon.go
View file

@ -1084,8 +1084,11 @@ func (daemon *Daemon) verifyContainerSettings(hostConfig *runconfig.HostConfig,
// First perform verification of settings common across all platforms.
if config != nil {
if config.WorkingDir != "" && !system.IsAbs(config.WorkingDir) {
return nil, fmt.Errorf("The working directory '%s' is invalid. It needs to be an absolute path.", config.WorkingDir)
if config.WorkingDir != "" {
config.WorkingDir = filepath.FromSlash(config.WorkingDir) // Ensure in platform semantics
if !system.IsAbs(config.WorkingDir) {
return nil, fmt.Errorf("The working directory '%s' is invalid. It needs to be an absolute path.", config.WorkingDir)
}
}
}