Browse code

remove old media type compat for plugins

Signed-off-by: Victor Vieux <vieux@docker.com>

Victor Vieux authored on 2016/12/08 10:35:09
Showing 3 changed files
... ...
@@ -355,8 +355,7 @@ func (p *v2Puller) pullV2Tag(ctx context.Context, ref reference.Named) (tagUpdat
355 355
 	}
356 356
 
357 357
 	if m, ok := manifest.(*schema2.DeserializedManifest); ok {
358
-		if m.Manifest.Config.MediaType == schema2.MediaTypePluginConfig ||
359
-			m.Manifest.Config.MediaType == "application/vnd.docker.plugin.image.v0+json" { //TODO: remove this v0 before 1.13 GA
358
+		if m.Manifest.Config.MediaType == schema2.MediaTypePluginConfig {
360 359
 			return false, errMediaTypePlugin
361 360
 		}
362 361
 	}
... ...
@@ -14,7 +14,7 @@ keywords: "API, Usage, plugins, documentation, developer"
14 14
 -->
15 15
 
16 16
 
17
-# Plugin Config Version 0 of Plugin V2
17
+# Plugin Config Version 1 of Plugin V2
18 18
 
19 19
 This document outlines the format of the V0 plugin configuration. The plugin
20 20
 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:
25 25
 
26 26
 Config Type  | Media Type
27 27
 ------------- | -------------
28
-config  | "application/vnd.docker.plugin.v0+json"
28
+config  | "application/vnd.docker.plugin.v1+json"
29 29
 
30 30
 
31 31
 ## *Config* Field Descriptions
... ...
@@ -153,8 +153,7 @@ func Pull(ref reference.Named, rs registry.Service, metaheader http.Header, auth
153 153
 		logrus.Debugf("pull.go: error in json.Unmarshal(): %v", err)
154 154
 		return nil, err
155 155
 	}
156
-	if m.Config.MediaType != schema2.MediaTypePluginConfig &&
157
-		m.Config.MediaType != "application/vnd.docker.plugin.image.v0+json" { //TODO: remove this v0 before 1.13 GA
156
+	if m.Config.MediaType != schema2.MediaTypePluginConfig {
158 157
 		return nil, ErrUnsupportedMediaType
159 158
 	}
160 159