[docker] fix image name when using sha256 for specs #3326
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some orchestrators init containers with the image sha256 instead of the image name, and docker inspect returns this. If it's the case, make a docker image inspect call to get the image name and cache the result
60bb7fe to
e0655cf
Compare
hkaj
requested changes
May 2, 2017
utils/dockerutil.py
Outdated
| name = image_spec.get('RepoTags')[0] | ||
| self._image_sha_to_name_mapping[image] = name | ||
| return name | ||
| except Exception: |
There was a problem hiding this comment.
This exception handling is risky. Either we expect a precise error and we should only catch that, or we catch everything with Exception but log something. Otherwise we open the door to sneaky bugs.
utils/dockerutil.py
Outdated
| name = name.split('@')[0] # Last resort, we get the name with no tag | ||
| self._image_sha_to_name_mapping[image] = name | ||
| return name | ||
| except Exception: |
utils/dockerutil.py
Outdated
| return name | ||
| except Exception: | ||
| pass | ||
| except Exception: |
0c7734a to
48d774e
Compare
hkaj
approved these changes
May 2, 2017
This was referenced May 10, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Some orchestrators init containers with the image sha256 instead of the
image name, and docker inspect returns this. If it's the case, make
a docker image inspect call to get the image name and cache the result
No cache invalidation is coded as image deletion don't trigger events and obsolete image count should be significant on a typical host
Motivation
Compatibility with k8s 1.6 & Nomad
Testing Guidelines
Added unit test for the three cases we support