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

Merge pull request #29230 from vieux/remove_old_media_type_plugin

Browse source 
remove old media type compat for plugins
This commit is contained in:
Anusha Ragunathan 2016-12-12 12:43:32 -08:00 committed by GitHub
commit 8de2336f07
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
distribution/pull_v2.go
View file

@ -355,8 +355,7 @@ func (p *v2Puller) pullV2Tag(ctx context.Context, ref reference.Named) (tagUpdat
} }
if m, ok := manifest.(*schema2.DeserializedManifest); ok { if m, ok := manifest.(*schema2.DeserializedManifest); ok {
if m.Manifest.Config.MediaType == schema2.MediaTypePluginConfig || 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
return false, errMediaTypePlugin return false, errMediaTypePlugin
} }
} }

4
docs/extend/config.md
View file

@ -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 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 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 Type | Media Type
------------- | ------------- ------------- | -------------
config | "application/vnd.docker.plugin.v0+json" config | "application/vnd.docker.plugin.v1+json"
## *Config* Field Descriptions ## *Config* Field Descriptions

3
plugin/distribution/pull.go
View file

@ -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) logrus.Debugf("pull.go: error in json.Unmarshal(): %v", err)
return nil, err return nil, err
} }
if m.Config.MediaType != schema2.MediaTypePluginConfig && if m.Config.MediaType != schema2.MediaTypePluginConfig {
m.Config.MediaType != "application/vnd.docker.plugin.image.v0+json" { //TODO: remove this v0 before 1.13 GA
return nil, ErrUnsupportedMediaType return nil, ErrUnsupportedMediaType
} }