diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-24 16:25:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-24 16:25:41 -0400 |
| commit | 0b9143df881f5de0f36f31bc2598e864fdeae7ed (patch) | |
| tree | 76ed319444ac750d898d06b986adf8341ed605ef /libpod/runtime_ctr.go | |
| parent | 4af2081424c8fa7ac191e9c5231d2429edb8327c (diff) | |
| parent | 915f8698f4f84fb79cf0438a5b6e4a283e75a7bf (diff) | |
| download | podman-0b9143df881f5de0f36f31bc2598e864fdeae7ed.tar.gz podman-0b9143df881f5de0f36f31bc2598e864fdeae7ed.tar.bz2 podman-0b9143df881f5de0f36f31bc2598e864fdeae7ed.zip | |
Merge pull request #6758 from mheon/v2.0.1_backports
V2.0.1 backports
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 0431861b5..f1752cbeb 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -83,6 +83,8 @@ func (r *Runtime) initContainerVariables(rSpec *spec.Spec, config *ContainerConf return nil, errors.Wrapf(err, "converting containers.conf ShmSize %s to an int", r.config.Containers.ShmSize) } ctr.config.ShmSize = size + ctr.config.StopSignal = 15 + ctr.config.StopTimeout = r.config.Engine.StopTimeout } else { // This is a restore from an imported checkpoint ctr.restoreFromCheckpoint = true @@ -107,8 +109,6 @@ func (r *Runtime) initContainerVariables(rSpec *spec.Spec, config *ContainerConf ctr.state.BindMounts = make(map[string]string) - ctr.config.StopTimeout = r.config.Engine.StopTimeout - ctr.config.OCIRuntime = r.defaultOCIRuntime.Name() // Set namespace based on current runtime namespace |