valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

transmit signal argument to docker's client.kill()

Browse Source
This commit is contained in:
Nicolas Delaby 2015-03-24 16:58:02 +01:00
parent fa4c1d74ea
commit ee7542ed44
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
salt/modules/dockerio.py
View File

@ -775,12 +775,16 @@ def stop(container, timeout=10):
return status
def kill(container):
def kill(container, signal=None):
'''
Kill a running container
container
container id
signal
signal to send
.. versionadded:: Beryllium
CLI Example:
@ -793,16 +797,23 @@ def kill(container):
try:
dcontainer = _get_container_infos(container)['Id']
if is_running(dcontainer):
client.kill(dcontainer)
if not is_running(dcontainer):
client.kill(dcontainer, signal=signal)
if signal:
# no need to check if container is running
# because some signals might not stop the container.
_valid(status,
comment='Container {0} was killed'.format(
container),
comment='Kill signal {0!r} successfully'
' sent to the container {1!r}'.format(signal, container),
id_=container)
else:
_invalid(status,
comment='Container {0} was not killed'.format(
container))
if not is_running(dcontainer):
_valid(status,
comment='Container {0} was killed'.format(container),
id_=container)
else:
_invalid(status,
comment='Container {0} was not killed'.format(
container))
else:
_valid(status,
comment='Container {0} was already stopped'.format(