Signed-off-by: Victor Vieux <vieux@docker.com>
| ... | ... |
@@ -358,7 +358,8 @@ func (p *v2Puller) pullV2Tag(ctx context.Context, ref reference.Named) (tagUpdat |
| 358 | 358 |
} |
| 359 | 359 |
|
| 360 | 360 |
if m, ok := manifest.(*schema2.DeserializedManifest); ok {
|
| 361 |
- if m.Manifest.Config.MediaType == schema2.MediaTypePluginConfig {
|
|
| 361 |
+ if m.Manifest.Config.MediaType == schema2.MediaTypePluginConfig || |
|
| 362 |
+ m.Manifest.Config.MediaType == "application/vnd.docker.plugin.image.v0+json" { //TODO: remove this v0 before 1.13 GA
|
|
| 362 | 363 |
return false, errMediaTypePlugin |
| 363 | 364 |
} |
| 364 | 365 |
} |
| ... | ... |
@@ -190,7 +190,7 @@ This section lists each version from latest to oldest. Each listing includes a |
| 190 | 190 |
* `POST /plugins/(plugin name)/set` configure a plugin. |
| 191 | 191 |
* `POST /plugins/(plugin name)/enable` enable a plugin. |
| 192 | 192 |
* `POST /plugins/(plugin name)/disable` disable a plugin. |
| 193 |
-* `POST /plugins/(plugin name)/push` push a pluging. |
|
| 193 |
+* `POST /plugins/(plugin name)/push` push a plugin. |
|
| 194 | 194 |
* `POST /plugins/create?name=(plugin name)` create a plugin. |
| 195 | 195 |
* `DELETE /plugins/(plugin name)` delete a plugin. |
| 196 | 196 |
|
| ... | ... |
@@ -153,7 +153,8 @@ 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 {
|
|
| 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
|
|
| 157 | 158 |
return nil, ErrUnsupportedMediaType |
| 158 | 159 |
} |
| 159 | 160 |
|
| ... | ... |
@@ -44,7 +44,7 @@ github.com/boltdb/bolt fff57c100f4dea1905678da7e90d92429dff2904 |
| 44 | 44 |
github.com/miekg/dns 75e6e86cc601825c5dbcd4e0c209eab180997cd7 |
| 45 | 45 |
|
| 46 | 46 |
# get graph and distribution packages |
| 47 |
-github.com/docker/distribution fbb70dc3a14ca65cdac3aaf5e5122b03b42f6fbc |
|
| 47 |
+github.com/docker/distribution c04791f441f98bcf073353d7317db83663cf3ea2 |
|
| 48 | 48 |
github.com/vbatts/tar-split v0.10.1 |
| 49 | 49 |
|
| 50 | 50 |
# get go-zfs packages |
| ... | ... |
@@ -18,7 +18,7 @@ const ( |
| 18 | 18 |
MediaTypeConfig = "application/vnd.docker.container.image.v1+json" |
| 19 | 19 |
|
| 20 | 20 |
// MediaTypePluginConfig specifies the mediaType for plugin configuration. |
| 21 |
- MediaTypePluginConfig = "application/vnd.docker.plugin.image.v0+json" |
|
| 21 |
+ MediaTypePluginConfig = "application/vnd.docker.plugin.v1+json" |
|
| 22 | 22 |
|
| 23 | 23 |
// MediaTypeLayer is the mediaType used for layers referenced by the |
| 24 | 24 |
// manifest. |