valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #21205 from cro/docker_cmd_run

Browse Source 
Need this for the IBM demo at SaltConf
This commit is contained in:
C. R. Oldham 2015-03-01 18:22:17 -07:00
commit adac6e6ffc
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/modules/dockerio.py
View File

@ -1807,7 +1807,8 @@ def _run_wrapper(status, container, func, cmd, *args, **kwargs):
def load(imagepath):
'''
Load the specified file at imagepath into docker that was generated from a docker save command
Load the specified file at imagepath into docker that was generated from
a docker save command
e.g. `docker load < imagepath`
imagepath
@ -1823,7 +1824,8 @@ def load(imagepath):
status = base_status.copy()
if os.path.isfile(imagepath):
try:
ret = __salt__['cmd.run']('docker load < ' + imagepath)
dockercmd = ['docker', 'load', '-i', imagepath]
ret = __salt__['cmd.run'](dockercmd)
if ((isinstance(ret, dict) and
('retcode' in ret) and
(ret['retcode'] != 0))):
@ -1873,7 +1875,8 @@ def save(image, filename):
if ok:
try:
ret = __salt__['cmd.run']('docker save ' + image + ' > ' + filename)
dockercmd = ['docker', '-o', filename, 'save', image]
ret = __salt__['cmd.run'](dockercmd)
if ((isinstance(ret, dict) and
('retcode' in ret) and
(ret['retcode'] != 0))):