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

Adding optional tag functionality to salt.modules.dockerio.push

Browse Source
This commit is contained in:
Nitin Madhok 2014-09-04 09:57:13 -04:00
parent 8b48542214
commit b324bedff1
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
salt/modules/dockerio.py
View File

@ -1621,14 +1621,17 @@ def _push_assemble_error_status(status, ret, logs):
return status
def push(repo, quiet=False):
def push(repo, tag=None, quiet=False):
'''
Pushes an image from any registry. See documentation at top of this page to
Pushes an image to any registry. See documentation at top of this page to
configure authenticated access
repo
name of repository
tag
specific tag to push (Optional)
quiet
set as ``True`` to quiet output, Default is ``False``
@ -1636,16 +1639,19 @@ def push(repo, quiet=False):
.. code-block:: bash
salt '*' docker.push <repository> [quiet=True|False]
salt '*' docker.push <repository> [tag] [quiet=True|False]
'''
client = _get_client()
status = base_status.copy()
registry, repo_name = docker.auth.resolve_repository_name(repo)
try:
ret = client.push(repo)
ret = client.push(repo, tag=tag)
if ret:
image_logs, infos = _parse_image_multilogs_string(ret, repo_name)
if image_logs:
repotag = repo_name
if tag:
repotag = '{0}:{1}'.format(repo, tag)
if not quiet:
status['out'] = image_logs
else:
@ -1659,7 +1665,7 @@ def push(repo, quiet=False):
status['status'] = True
status['id'] = _get_image_infos(repo)['Id']
status['comment'] = 'Image {0}({1}) was pushed'.format(
repo, status['id'])
repotag, status['id'])
else:
_push_assemble_error_status(status, ret, image_logs)
else: