Copy: Support MIME type changes, two-step updates #1147
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
mtrmac
force-pushed
the
copy-two-updates
branch
2 times, most recently
from
064918f
to
2877b1b
Compare
|
Hi, any progress on that? |
|
@mtrmac This needs a rebase I believe. |
|
Not just a rebase, this is an alternative to #1138 and should, if pursued, revert/replace that. |
|
Ok let's close this and concentrate on whether or not the merged fix solves the issue. |
|
I need some way to track investigating this avenue. |
mtrmac
force-pushed
the
copy-two-updates
branch
from
0ba6543
to
912da56
Compare
Currently, horribly, types.UpdatedImage is _documented_ to ignore ManifestUpdateOptions.LayerInfos.MediaType; so if LayerInfosForCopy replaces a layer with a differently-compressed one, that MIME type update is never performed. First, work around that by adding updatedImageWithMIME as a hopefully temporary hack that implements the edit using CompressionOperation + CompressionAlgorithm (which are not documented to be ignored). Then, use it to process LayerInfosForCopy. Because LayerInfosForCopy's MediaType values are manifest-schema specific, we must call UpdatedImage(WithMime) twice: once just to update the layers with LayerInfosForCopy information using the original schema, and later to possibly convert the manifest and apply CompressionOperation/... from results of TryReusingBlob/PutBlob. So, move the LayerInfosForCopy processing before determineManifestConversion requests a MIME type change. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Only call ic.src.LayerInfos() if necessary to evaluate UpdatedLayerInfosForCopy(). Signed-off-by: Miloslav Trmač <mitr@redhat.com>
mtrmac
force-pushed
the
copy-two-updates
branch
from
912da56
to
8040d74
Compare
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.
See #1138 for the exploratory discussion, and commit messages for details.