Merge pull request containerd#10069 from anmaxvl/hpc-default-workingdir

mxpv · web-flow · commit 92900bf7300b · 2024-04-12T18:12:42.000Z
fix default working directory `hostProcess`
diff --git a/internal/cri/server/container_create.go b/internal/cri/server/container_create.go
@@ -858,6 +858,8 @@ func (c *criService) buildWindowsSpec(
 		specOpts = append(specOpts, oci.WithProcessCwd(config.GetWorkingDir()))
 	} else if imageConfig.WorkingDir != "" {
 		specOpts = append(specOpts, oci.WithProcessCwd(imageConfig.WorkingDir))
+	} else if cntrHpc {
+		specOpts = append(specOpts, oci.WithProcessCwd(`C:\hpc`))
 	}
 
 	if config.GetTty() {

Original file line number	Diff line number	Diff line change
`@@ -858,6 +858,8 @@ func (c *criService) buildWindowsSpec(`
`858`	`858`	`specOpts = append(specOpts, oci.WithProcessCwd(config.GetWorkingDir()))`
`859`	`859`	`} else if imageConfig.WorkingDir != "" {`
`860`	`860`	`specOpts = append(specOpts, oci.WithProcessCwd(imageConfig.WorkingDir))`
	`861`	`+ } else if cntrHpc {`
	`862`	+ specOpts = append(specOpts, oci.WithProcessCwd(`C:\hpc`))
`861`	`863`	`}`
`862`	`864`
`863`	`865`	`if config.GetTty() {`