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 #37954 from gtmanfred/2016.11

Browse source 
use sleep from path for docker.sls_build
This commit is contained in:
Mike Place 2016-11-30 11:08:44 -07:00 • committed by GitHub
commit 0a041277ea
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/dockerng.py
View file

@ -5883,7 +5883,7 @@ def sls_build(name, base='opensuse/python', mods=None, saltenv='base',
# start a new container
ret = __salt__['dockerng.create'](image=base,
name=name,
cmd='/usr/bin/sleep infinity',
cmd='sleep infinity',
interactive=True, tty=True)
id_ = ret['Id']
try:

2
tests/unit/modules/dockerng_test.py
View file

@ -671,7 +671,7 @@ class DockerngTestCase(TestCase):
mods='foo',
)
docker_create_mock.assert_called_once_with(
cmd='/usr/bin/sleep infinity',
cmd='sleep infinity',
image='opensuse/python', interactive=True, name='foo', tty=True)
docker_start_mock.assert_called_once_with('ID')
docker_sls_mock.assert_called_once_with('ID', 'foo', 'base')