Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[dockerng] RepoTags can be also be None with docker 1.12 #35447

Merged
merged 1 commit into from
Aug 15, 2016

Conversation

ticosax
Copy link
Contributor

@ticosax ticosax commented Aug 15, 2016

What does this PR do?

Add support for images response when RepoTags entry is None

{u'Created': 1471252564,
 u'Id': u'sha256:fffffffffffffffffffffffffffffffff',
 u'Labels': {},
 u'ParentId': u'',
 u'RepoDigests': [u'repo/image@sha256:ffffffffffffffffffffffffffffffffff'],
 u'RepoTags': None,  # <--- HERE 
 u'Size': 281902218,
 u'VirtualSize': 281902218}

What issues does this PR fix or reference?

#35308 #34702

Previous Behavior

Was not fixed at the right place.

New Behavior

Provide a fix, I believe to be correct.

Tests written?

Yes

Please review Salt's Contributing Guide for best practices.

@ticosax ticosax changed the title [dockerng] Repo tags null docker 1.12 [dockerng] RepoTags can be also be None with docker 1.12 Aug 15, 2016
@ticosax ticosax closed this Aug 15, 2016
@ticosax
Copy link
Contributor Author

ticosax commented Aug 15, 2016

I got tricked by github

@ticosax ticosax reopened this Aug 15, 2016
Add support for this new value.
@rallytime
Copy link
Contributor

Thanks @ticosax

@rallytime rallytime merged commit 49af330 into saltstack:2016.3 Aug 15, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Aug 16, 2016
* upstream/develop: (26 commits)
  Use BytesIO from six for gzip operations (saltstack#35484)
  Return cleaner error on pillar/grains rendering failure (saltstack#35437)
  LXC execution module Carbon deprecations
  Add soem more notes to the salt-cp doc
  call to boto_secgroup.convert_to_group_ids should be by keyword args, the earlier code would end up with incorrect parameters being used with region being mapped to vpc_name.
  Fix orderering in test_add_rule
  Fix failing win_firewall_tests
  [develop] Update bootstrap script to latest stable (2016.08.15) (saltstack#35462)
  [2016.3] Update bootstrap script to latest stable (2016.08.15) (saltstack#35461)
  Make `auth_timeout` user configurable again
  Fix cp.push_dir pushing empty dirs (saltstack#35442)
  Docker 1.12 reports tags as null (saltstack#35447)
  move routine call out of try/except block
  Minor doc fixup (saltstack#35436)
  Modular minion data cache.
  Correct errant call to argspec from master. Fix ext_job_cache. (saltstack#35427)
  Resolve stacktrace logged by highstate outputter if sls cannot be found (saltstack#35428)
  Fix opts ref, I forgot that salt-ssh state.pkg uses opts magic
  Only allow one sync read to happen at a time.
  Add to release notes, snapper!
  ...
@ticosax ticosax deleted the RepoTags-null-docker-1.12 branch August 17, 2016 08:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants