imagetools: validate descriptor input for create -f - #3933
Merged
tonistiigi merged 2 commits intoJul 7, 2026
Merged
Conversation
3 tasks
Contributor
Author
|
@jsternberg @jedevc friendly review request — targets the descriptor validation discussed on #2091 (clear error for manifest/index JSON piped from |
Return a clear error when -f contains a manifest or index instead of an OCI content descriptor, and reject descriptors missing a valid digest. Avoids a nil-pointer panic when piping inspect --raw output into imagetools create. Fixes docker#2091 Signed-off-by: amarkdotdev <amarkdotdev@users.noreply.github.com>
amarkdotdev
force-pushed
the
fix/imagetools-create-descriptor-validation
branch
from
July 6, 2026 20:25
32761fb to
89ec9fe
Compare
tonistiigi
reviewed
Jul 7, 2026
tonistiigi
left a comment
tonistiigi
left a comment
Member
There was a problem hiding this comment.
Commit message says this fixes a panic but I don't think that is correct.
Parse schemaVersion and descriptor fields in a single pass instead of calling json.Unmarshal twice. Signed-off-by: amarkdotdev <amarkdotdev@users.noreply.github.com>
Contributor
Author
|
@tonistiigi see my latest commit please. |
tonistiigi
approved these changes
Jul 7, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Summary
imagetools create -fis an OCI content descriptor, not a manifest or index.Fixes #2091
Test plan
go test ./commands/imagetools/ -run TestParseSourceDescriptorValidationdocker buildx imagetools inspect --raw alpine | docker buildx imagetools create -f /dev/stdin -t example/testreturns a descriptive error (no panic)