Browse Source

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

Windows: Ensure workdir handled in platform semantics
Jessie Frazelle 10 years ago
parent
commit
c6dd451073
1 changed files with 5 additions and 2 deletions
  1. 5 2
      daemon/daemon.go

+ 5 - 2
daemon/daemon.go

@@ -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)
+			}
 		}
 	}