saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

provide kwargs to dockerng.create to provide all features to sls_build as well

Browse source
This commit is contained in:
Michael Calmer 2016-12-13 14:31:56 +01:00
parent 7ead1ed336
commit 455c18325c
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/modules/dockerng.py
View file

@ -5881,11 +5881,19 @@ def sls_build(name, base='opensuse/python', mods=None, saltenv='base',
.. versionadded:: 2016.11.0
'''
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')
create_kwargs.pop('tty')
# start a new container
ret = __salt__['dockerng.create'](image=base,
name=name,
cmd='sleep infinity',
interactive=True, tty=True)
interactive=True, tty=True,
**create_kwargs)
id_ = ret['Id']
try:
__salt__['dockerng.start'](id_)