containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

set pidfile default value int containerconfig 

Signed-off-by: chenkang <kongchen28@gmail.com>
This commit is contained in:
chenkang 2021-04-17 21:15:08 +08:00
parent b963a5eb4a
commit 728b73d7c4
No known key found for this signature in database
GPG Key ID: A592F3AE7ECB096B
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libpod/oci_conmon_linux.go
View File

@ -1025,12 +1025,7 @@ func (r *ConmonOCIRuntime) createOCIContainer(ctr *Container, restoreOptions *Co
} }
} }
pidfile := ctr.config.PidFile args := r.sharedConmonArgs(ctr, ctr.ID(), ctr.bundlePath(), ctr.config.PidFile, ctr.LogPath(), r.exitsDir, ociLog, ctr.LogDriver(), logTag)
if pidfile == "" {
pidfile = filepath.Join(ctr.state.RunDir, "pidfile")
}
args := r.sharedConmonArgs(ctr, ctr.ID(), ctr.bundlePath(), pidfile, ctr.LogPath(), r.exitsDir, ociLog, ctr.LogDriver(), logTag)
if ctr.config.Spec.Process.Terminal { if ctr.config.Spec.Process.Terminal {
args = append(args, "-t") args = append(args, "-t")

4
libpod/runtime_ctr.go
View File

@ -366,6 +366,10 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (_ *Contai
ctr.config.ConmonPidFile = filepath.Join(ctr.state.RunDir, "conmon.pid") ctr.config.ConmonPidFile = filepath.Join(ctr.state.RunDir, "conmon.pid")
} }
if ctr.config.PidFile == "" {
ctr.config.PidFile = filepath.Join(ctr.state.RunDir, "pidfile")
}
// Go through named volumes and add them. // Go through named volumes and add them.
// If they don't exist they will be created using basic options. // If they don't exist they will be created using basic options.
// Maintain an array of them - we need to lock them later. // Maintain an array of them - we need to lock them later.