From d8e435ab6cb51936f922fe4c9feac46cedd17e8f Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Wed, 7 Dec 2016 17:35:09 -0800 Subject: [PATCH] remove old media type compat for plugins Signed-off-by: Victor Vieux (cherry picked from commit f644e758bd58f7b045a52b29038ae0043b0c9e3d) Signed-off-by: Victor Vieux --- distribution/pull_v2.go | 3 +-- docs/extend/config.md | 4 ++-- plugin/distribution/pull.go | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/distribution/pull_v2.go b/distribution/pull_v2.go index 5bfb328a18..806ca85382 100644 --- a/distribution/pull_v2.go +++ b/distribution/pull_v2.go @@ -355,8 +355,7 @@ func (p *v2Puller) pullV2Tag(ctx context.Context, ref reference.Named) (tagUpdat } if m, ok := manifest.(*schema2.DeserializedManifest); ok { - if m.Manifest.Config.MediaType == schema2.MediaTypePluginConfig || - m.Manifest.Config.MediaType == "application/vnd.docker.plugin.image.v0+json" { //TODO: remove this v0 before 1.13 GA + if m.Manifest.Config.MediaType == schema2.MediaTypePluginConfig { return false, errMediaTypePlugin } } diff --git a/docs/extend/config.md b/docs/extend/config.md index 93ed4958a3..eca33803c2 100644 --- a/docs/extend/config.md +++ b/docs/extend/config.md @@ -14,7 +14,7 @@ keywords: "API, Usage, plugins, documentation, developer" --> -# Plugin Config Version 0 of Plugin V2 +# Plugin Config Version 1 of Plugin V2 This document outlines the format of the V0 plugin configuration. The plugin config described herein was introduced in the Docker daemon in the [v1.12.0 @@ -25,7 +25,7 @@ configs can be serialized to JSON format with the following media types: Config Type | Media Type ------------- | ------------- -config | "application/vnd.docker.plugin.v0+json" +config | "application/vnd.docker.plugin.v1+json" ## *Config* Field Descriptions diff --git a/plugin/distribution/pull.go b/plugin/distribution/pull.go index 3e185cb0d3..95743aa577 100644 --- a/plugin/distribution/pull.go +++ b/plugin/distribution/pull.go @@ -153,8 +153,7 @@ func Pull(ref reference.Named, rs registry.Service, metaheader http.Header, auth logrus.Debugf("pull.go: error in json.Unmarshal(): %v", err) return nil, err } - if m.Config.MediaType != schema2.MediaTypePluginConfig && - m.Config.MediaType != "application/vnd.docker.plugin.image.v0+json" { //TODO: remove this v0 before 1.13 GA + if m.Config.MediaType != schema2.MediaTypePluginConfig { return nil, ErrUnsupportedMediaType }