Merge "Make sure failed containers get stopped by systemd" into stable/ussuri
This commit is contained in:
commit
b7433ba7f7
|
@ -41,6 +41,7 @@ class TestUtilsSystemd(base.TestCase):
|
|||
self.assertIn('Wants=something.service', unit)
|
||||
self.assertIn('Restart=always', unit)
|
||||
self.assertIn('ExecStop=/usr/bin/podman stop -t 15 my_app', unit)
|
||||
self.assertIn('ExecStopPost=/usr/bin/podman stop -t 15 my_app', unit)
|
||||
self.assertIn('PIDFile=/var/run/my_app.pid', unit)
|
||||
mock_chmod.assert_has_calls([mock.call(sysd_unit_f, 420)])
|
||||
|
||||
|
|
|
@ -101,6 +101,7 @@ Restart=%(restart)s
|
|||
ExecStart=%(start_cmd)s
|
||||
ExecReload=/usr/bin/podman kill --signal HUP %(name)s
|
||||
ExecStop=/usr/bin/podman stop -t %(stop_grace_period)s %(name)s
|
||||
ExecStopPost=/usr/bin/podman stop -t %(stop_grace_period)s %(name)s
|
||||
KillMode=none
|
||||
Type=forking
|
||||
PIDFile=/var/run/%(name)s.pid
|
||||
|
|
Loading…
Reference in New Issue