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

Merge pull request #38229 from mcalmer/dockerng-sls_build-kwargs

Browse source 
provide kwargs of sls_build to dockerng.create
This commit is contained in:
Mike Place 2016-12-18 06:13:09 -07:00 • committed by GitHub
commit ecd441d090
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))
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,
name=name,
cmd='sleep infinity',
interactive=True, tty=True)
interactive=True, tty=True,
**create_kwargs)
id_ = ret['Id']
try:
__salt__['dockerng.start'](id_)