Skip to content

Conversation

@dnephin
Copy link

@dnephin dnephin commented Apr 24, 2015

Fixes #923

Also consolidates the pulls to a single place. Previously the pull triggered by create would stream output, but the direct pull would not. Now they will both stream output.

Integration test added to cover the failure case.

@dnephin
Copy link
Author

dnephin commented Apr 24, 2015

@aanand It took me a couple weeks to get to it, but I think this is ready now

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the assert_called_once_with inside this with block ever reached, if create_container raises an APIError?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, you're right, it needs to be pulled out of the with block.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
@dnephin dnephin force-pushed the fix_pull_with_sha branch from 7e1f7a0 to 3dd860f Compare April 29, 2015 14:13
@dnephin
Copy link
Author

dnephin commented Apr 29, 2015

Fixed the unit test

@aanand aanand added this to the 1.3.0 milestone Apr 29, 2015
@aanand
Copy link

aanand commented Apr 29, 2015

LGTM

aanand added a commit that referenced this pull request Apr 29, 2015
Support image with ids instead of names
@aanand aanand merged commit 7e0ab07 into docker:master Apr 29, 2015
@dnephin dnephin deleted the fix_pull_with_sha branch May 8, 2015 01:28
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.

Can no longer reference local image with docker-compose

3 participants