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

contrib: Fix analyze_local_images when image has missing layers #373

Merged
merged 1 commit into from
Apr 28, 2017

Conversation

josuesdiaz
Copy link

This issue was originally addressed in #69, but looks to have been
reverted since then. As of right now, certain images that have missing
layers or layers that are not in the docker save output will cause an error
with the analyze_local_images command. Switching back to reading layers
from manifest.json file from docker save of the image.

@jzelinskie
Copy link
Contributor

Hey there,

It looks like this is (sadly) the best way to do this. I had reproduced a bug locally using this method, but it seems far less likely to occur than to have the command have missing layers.

Can you make your commit simply a git revert of e639367a3082c5a2067803e9c66f1258d4e2b919?

…layers-v2"

This reverts commit e639367, reversing
changes made to f3848d9. Issue involved
the docker history command providing missing fs layers that were not in
the saved image. Revert commit to using the manifest file again.
@josuesdiaz
Copy link
Author

Ya sure, sorry should have thought to do that in the first place. Updated the branch, and you should see the revert only in PR now.

Copy link
Contributor

@jzelinskie jzelinskie left a comment

Choose a reason for hiding this comment

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

LGTM.

@jzelinskie jzelinskie merged commit 99a859f into quay:master Apr 28, 2017
KeyboardNerd pushed a commit to KeyboardNerd/clair that referenced this pull request Feb 2, 2018
contrib: Fix analyze_local_images when image has missing layers
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants