From e3034309b3ac22680d0a1d953240369b3919b6c3 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Fri, 2 Dec 2016 14:07:24 -0800 Subject: [PATCH] "fix" plugin tests in 1.12.x Signed-off-by: Victor Vieux --- plugin/distribution/pull.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugin/distribution/pull.go b/plugin/distribution/pull.go index 1bae8d4bb7..b8b3ebb492 100644 --- a/plugin/distribution/pull.go +++ b/plugin/distribution/pull.go @@ -143,7 +143,8 @@ func Pull(name string, rs registry.Service, metaheader http.Header, authConfig * logrus.Debugf("pull.go: error in json.Unmarshal(): %v", err) return nil, err } - if m.Config.MediaType != MediaTypeConfig { + if m.Config.MediaType != MediaTypeConfig && + m.Config.MediaType != "application/vnd.docker.plugin.image.v0+json" { return nil, ErrUnsupportedMediaType }