Merge pull request #30262 from aaronlehmann/text-html

distribution: Add text/html and application/json as image mediatypes Upstream-commit: f6337649133ceb300a18e604ae96ca8a30c42541 Component: engine
2017-01-24 01:13:35 +01:00
parent ff90a502e8 c4cc189597
commit 060b9f6e35
1 changed files with 4 additions and 0 deletions
@@ -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
 	"",
 }