diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-24 13:02:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-24 13:02:43 -0400 |
| commit | b61e429f199ca0f164054a9d758e60f94aa4d81e (patch) | |
| tree | b1e5c11ad8da1496f34367c83fdbed3e653bce3c /libpod | |
| parent | 988fd27541dfa852ee9543c2d8a916896ef0c774 (diff) | |
| parent | 7fe4c5204e7c0d98f87b0408b959f312b08177e3 (diff) | |
| download | podman-b61e429f199ca0f164054a9d758e60f94aa4d81e.tar.gz podman-b61e429f199ca0f164054a9d758e60f94aa4d81e.tar.bz2 podman-b61e429f199ca0f164054a9d758e60f94aa4d81e.zip | |
Merge pull request #6732 from mheon/fix_stopsignal_set
Set stop signal to 15 when not explicitly set
Diffstat (limited to 'libpod')
| -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 |