зеркало из https://github.com/microsoft/docker.git
remove old media type compat for plugins
Signed-off-by: Victor Vieux <vieux@docker.com>
This commit is contained in:
Родитель
dca76ed50a
Коммит
f644e758bd
|
@ -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
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче