Use correct media type for config blob in schema2 manifest#1622
Merged
RichardScothern merged 1 commit intodistribution:masterfrom Apr 12, 2016
Merged
Conversation
The schema2 manifest builder fills in this part of the manifest based on the descriptor it gets back from BlobIngester's Put method. It passes the correct media type to Put, but Put ends up replacing this value with application/octet-stream in its return value. This commit works around the issue in the manifest builder. Arguably Put should not be changing the media type in its return value, but this commit is a targeted fix to keep it very low-risk for possible inclusion in Docker 1.11. Fixes distribution#1621 (but maybe we should open a separate issue for the media type behavior in the distribution client, and the unnecessary stat). Signed-off-by: Aaron Lehmann <[email protected]>
Collaborator
|
LGTM |
1 similar comment
|
LGTM |
Current coverage is
|
aaronlehmann
pushed a commit
to aaronlehmann/docker
that referenced
this pull request
Apr 12, 2016
…fest @nwt noticed that the media type specified in the config section of a schema2 manifest is application/octet-stream, instead of the correct value application/vnd.docker.container.image.v1+json. This brings in distribution/distribution#1622 to fix this. Signed-off-by: Aaron Lehmann <[email protected]>
mlaventure
pushed a commit
to mlaventure/docker
that referenced
this pull request
Apr 25, 2016
…fest @nwt noticed that the media type specified in the config section of a schema2 manifest is application/octet-stream, instead of the correct value application/vnd.docker.container.image.v1+json. This brings in distribution/distribution#1622 to fix this. Signed-off-by: Aaron Lehmann <[email protected]> (cherry picked from commit c18d03a)
2 tasks
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
5 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.
The schema2 manifest builder fills in this part of the manifest based on
the descriptor it gets back from
BlobIngester'sPutmethod. It passesthe correct media type to
Put, butPutends up replacing this value withapplication/octet-streamin its return value.This commit works around the issue in the manifest builder. Arguably
Putshould not be changing the media type in its return value, but this
commit is a targeted fix to keep it very low-risk for possible inclusion
in Docker 1.11.
Fixes #1621 (but maybe we should open a separate issue for the media
type behavior in the distribution client, and the unnecessary stat).