sparse: do not modify media type when unspecified #233
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
The media type should only be modified when the user specifies it. In my case I noticed the digest given by the sparse.Image was not the same as the image it was dervied from. This was because the logic to set the media type defaulted to overriding to OCI if the media type was not specified. This commit changes the logic to only override the media type if the user specifies it. Signed-off-by: Jesse Brown <jabrown85@gmail.com>
Signed-off-by: Jesse Brown <jabrown85@gmail.com>
jjbustamante
reviewed
Nov 3, 2023
jabrown85
commented
Nov 3, 2023
layout/new.go
Outdated
| @@ -58,7 +59,7 @@ func NewImage(path string, ops ...ImageOption) (*Image, error) { | |||
| ri.createdAt = imageOpts.createdAt | |||
| } | |||
|
|
|||
| if imageOpts.mediaTypes == imgutil.MissingTypes { | |||
| if imageOpts.mediaTypes == imgutil.MissingTypes && !hasBaseImage { | |||
There was a problem hiding this comment.
Yeah. The idea is that if layout.WithMediaTypes is omitted, the imageOpts.mediaTypes will be imgutil.MissingTypes. In the case where there was a base image (always true in sparse, not always true in layout) - we should default to matching the base image.
jjbustamante
reviewed
Nov 3, 2023
Signed-off-by: Jesse Brown <jabrown85@gmail.com>
jjbustamante
approved these changes
Nov 3, 2023
Signed-off-by: Jesse Brown <jabrown85@gmail.com>
|
I don't think lifecycle is aware of sparse vs layout at all today and this should change nothing there. |
As I mentioned on Slack:
-f, --format string MANIFEST TYPE (oci, v2s1, or v2s2) to use in the destination (default is manifest type of source, with fallbacks)
|
natalieparellano
approved these changes
Nov 13, 2023
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.
The media type should only be modified when the user specifies it. In my case I noticed the digest given by the sparse.Image was not the same as the image it was dervied from. This was because the logic to set the media type defaulted to overriding to OCI if the media type was not specified. This commit changes the logic to only override the media type if the user specifies it.