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 #22955 from terminalmage/dockerio-run-fix

Browse source 
Fix regression introduced yesterday in dockerio module
This commit is contained in:
Justin Findlay 2015-04-22 12:56:39 -06:00
commit 89fa18500c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/dockerio.py
View file

@ -1741,7 +1741,7 @@ def _run_wrapper(status, container, func, cmd, *args, **kwargs):
return status
full_cmd = (
'nsenter --target {pid} --mount --uts --ipc --net --pid'
' {cmd}'.format(pid=container_pid, cmd=cmd)
' -- {cmd}'.format(pid=container_pid, cmd=cmd)
)
else:
raise CommandExecutionError(