mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
use sleep from path for docker.sls_build
sleep sometimes is found in /bin/sleep, like in ubuntu. We should just depend on the PATH variable being correct, and finding sleep, instead of explicitly saying /usr/bin/sleep
This commit is contained in:
parent
ca3a9488f1
commit
9caf0b406d
2 changed files with 2 additions and 2 deletions
|
@ -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:
|
||||
|
|
|
@ -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')
|
||||
|
|
Loading…
Add table
Reference in a new issue