github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #943 from mlaventure/honor-runtime-conf

Browse Source 
Use conf value when killing loaded container
This commit is contained in:
Phil Estes 2017-06-01 17:12:17 -04:00 committed by GitHub
commit 7071276f64
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux/runtime.go
View File

@ -278,8 +278,8 @@ func (r *Runtime) loadContainer(path string) (*Task, error) {
func (r *Runtime) killContainer(ctx context.Context, id string) { func (r *Runtime) killContainer(ctx context.Context, id string) {
log.G(ctx).Debug("terminating container after failed load") log.G(ctx).Debug("terminating container after failed load")
runtime := &runc.Runc{ runtime := &runc.Runc{
// TODO: get Command provided for initial container creation // TODO: should we get Command provided for initial container creation?
// Command: r.Runtime, Command: r.runtime,
LogFormat: runc.JSON, LogFormat: runc.JSON,
PdeathSignal: unix.SIGKILL, PdeathSignal: unix.SIGKILL,
} }