Fix inspection of unsigned schema1 images #1748
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
... just because this is incorrect and confusing. Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
... by not incorrectly invoking the schema2 code; otherwise it tries to unmarshal nil as JSOn, and fails. I'm not sure whether schema1 images can contain a comment or a health check; just not crashing is an improvement. Signed-off-by: Miloslav Trmač <[email protected]>
|
(It would be nice to have unit tests for inspect, but I’m primarily working on other things; this is just a minimal change so that the original diagnosis is not completely lost.) |
|
Tested manually: $ for f in oci v2s2 v2s1; do skopeo copy --format $f docker://quay.io/libpod/alpine dir:f-$f || break; done
$ cp -a f-v2s1 f-v2s1-unsigned
$ vi f-v2s1-unsigned/manifest.json # to remove the "signatures" top-level field
$ for f in oci v2s2 v2s1 v2s1-unsigned; do bin/podman rmi -a && skopeo copy --preserve-digests dir:f-$f containers-storage:f-$f && bin/podman image inspect f-$f || break; doneThe
|
|
LGTM |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: mtrmac, vrothberg The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
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.
… by not doing anything, like with the (much more common) signed schema1 images.
Fixes containers/podman#20156 .