Add --prefer-index flag forimagetools create on a single source
#2482
Conversation
…to the list of mediatypes we return the original bytes for when calling *Resolver.Combine rather than adding it to a newly created manifest list Signed-off-by: Tim Smith <tismith@rvohealth.com>
util/imagetools/create.go
Outdated
| @@ -79,7 +79,7 @@ func (r *Resolver) Combine(ctx context.Context, srcs []*Source, ann []string) ([ | |||
|
|
|||
| // on single source, return original bytes | |||
| if len(srcs) == 1 && len(ann) == 0 { | |||
| if mt := srcs[0].Desc.MediaType; mt == images.MediaTypeDockerSchema2ManifestList || mt == ocispec.MediaTypeImageIndex { | |||
| if mt := srcs[0].Desc.MediaType; mt == images.MediaTypeDockerSchema2ManifestList || mt == images.MediaTypeDockerSchema2Manifest || mt == ocispec.MediaTypeImageIndex { | |||
There was a problem hiding this comment.
If that is the desired behavior then why is there a mediatype check at all, or at least why is ocispec.MediaTypeImageManifest missing?
There was a problem hiding this comment.
Ahhhhh great point! Yeah, it actually seems reasonable that there doesn't even need to be a check. Thinking through the logic, I guess I can't really think of when the logic would need to be different here. Seems like if there is one source and no annotations (and possibly if the --preserve-single-source flag is set to true, based on my response to your other comment), we should just return the original bytes. I almost feel like I'm missing something here though. It feels like this is here for a reason, but maybe it is just an oversight.
@tonistiigi great point. I was too focused on my own use case, but yeah, I definitely agree that some people are probably using this explicitly hoping to convert to a manifest list, or at the very least they've probably built workflows that are expecting this behavior, so changing the default behavior is probably too risky. So, 2 things:
Thoughts? |
|
Maybe smth. like |
Nice. I'll make some changes and push them up. |
…havior when deciding on how to create an image/manifest from a single source. Signed-off-by: Tim Smith <tismith@rvohealth.com>
…we return original bytes without filtering on mediaType, based on the preferIndex preference. Signed-off-by: Tim Smith <tismith@rvohealth.com>
Signed-off-by: Tim Smith <tismith@rvohealth.com>
…n index regardless of what value you specify. Signed-off-by: Tim Smith <tismith@rvohealth.com>
|
I split the difference and landed on |
Signed-off-by: Tim Smith <tismith@rvohealth.com>
--prefer-index flag which allows you to preserve the source manifest format instead of converting to a manifest list when calling imagetools create on a single source
--prefer-index flag which allows you to preserve the source manifest format instead of converting to a manifest list when calling imagetools create on a single source--prefer-index flag forimagetools create on a single source
--prefer-index flag forimagetools create on a single source--prefer-index flag forimagetools create on a single source
imagetools createwith single source changes copied image fromapplication/vnd.docker.distribution.manifest.v2+jsontoapplication/vnd.docker.distribution.manifest.list.v2+json#2481--prefer-index=false