From 37be2d4e9b4fb88afbe727e68da3d32bf7e02a88 Mon Sep 17 00:00:00 2001 From: Aaron Lehmann Date: Wed, 18 Jan 2017 18:19:12 -0800 Subject: [PATCH] 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 (cherry picked from commit a215e15cb1fbecc3b22d4f90e15638728ac7ac78) Signed-off-by: Victor Vieux --- distribution/registry.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/distribution/registry.go b/distribution/registry.go index f8bb1ecf65..95e181ded8 100644 --- a/distribution/registry.go +++ b/distribution/registry.go @@ -23,7 +23,11 @@ import ( var ImageTypes = []string{ schema2.MediaTypeImageConfig, // 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/json", + "text/html", // Treat defaulted values as images, newer types cannot be implied "", }