valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make it explicit that we want to delete these keys

Browse Source
This commit is contained in:
Michael Calmer 2016-12-16 09:40:58 +01:00
parent 4c710139b5
commit e7292fabb7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/modules/dockerng.py
View File

@ -5882,11 +5882,11 @@ def sls_build(name, base='opensuse/python', mods=None, saltenv='base',
'''
create_kwargs = salt.utils.clean_kwargs(**copy.deepcopy(kwargs))
create_kwargs.pop('image', '')
create_kwargs.pop('name', '')
create_kwargs.pop('cmd', '')
create_kwargs.pop('interactive', True)
create_kwargs.pop('tty', True)
for key in ('image', 'name', 'cmd', 'interactive', 'tty'):
try:
del create_kwargs[key]
except KeyError:
pass
# start a new container
ret = __salt__['dockerng.create'](image=base,