1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

distribution: Add text/html and application/json as image mediatypes

As noted by #30083, the new strict checking of mediatypes misses some
cases where earlier bugs caused nonstandard mediatypes to be stored in
manifests. Two of the known cases are text/html and application/json,
which were returned by certain registries and stored by earlier versions
of Docker. Add special cases for text/html and application/json.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
This commit is contained in:
Aaron Lehmann 2017-01-18 18:19:12 -08:00
parent 0e8c7d7277
commit a215e15cb1

View file

@ -23,7 +23,11 @@ import (
var ImageTypes = []string{ var ImageTypes = []string{
schema2.MediaTypeImageConfig, schema2.MediaTypeImageConfig,
// Handle unexpected values from https://github.com/docker/distribution/issues/1621 // Handle unexpected values from https://github.com/docker/distribution/issues/1621
// (see also https://github.com/docker/docker/issues/22378,
// https://github.com/docker/docker/issues/30083)
"application/octet-stream", "application/octet-stream",
"application/json",
"text/html",
// Treat defaulted values as images, newer types cannot be implied // Treat defaulted values as images, newer types cannot be implied
"", "",
} }