vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #423 from mrunalp/set_default_cwd

Browse source 
Set default working directory to /
This commit is contained in:
Mrunal Patel 2017-03-31 16:04:49 -07:00 committed by GitHub
commit bbe2dea0a6
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
server/container_create.go
View file

@ -520,13 +520,16 @@ func (s *Server) createSandboxContainer(ctx context.Context, containerID string,
// Set working directory // Set working directory
// Pick it up from image config first and override if specified in CRI // Pick it up from image config first and override if specified in CRI
containerCwd := "/"
imageCwd := containerInfo.Config.Config.WorkingDir imageCwd := containerInfo.Config.Config.WorkingDir
specgen.SetProcessCwd(imageCwd) if imageCwd != "" {
containerCwd = imageCwd
cwd := containerConfig.WorkingDir
if cwd != "" {
specgen.SetProcessCwd(cwd)
} }
runtimeCwd := containerConfig.WorkingDir
if runtimeCwd != "" {
containerCwd = runtimeCwd
}
specgen.SetProcessCwd(containerCwd)
// Setup user and groups // Setup user and groups
if linux != nil { if linux != nil {