Merge pull request #135 from runcom/fixup-1

*: remove references to combined schema
opencontainers · Jun 14, 2016 · 59f9518 · 59f9518
2 parents ecdaaaf + 0afb2b7
commit 59f9518
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/media-types.md b/media-types.md
@@ -7,7 +7,6 @@ The following `mediaType` MIME types are used by the formats described here, and
 - `application/vnd.oci.image.manifest.v1+json`: [Image manifest format](manifest.md#image-manifest)
 - `application/vnd.oci.image.serialization.rootfs.tar.gzip`: ["Layer", as a gzipped tar archive](serialization.md#creating-an-image-filesystem-changeset)
 - `application/vnd.oci.image.serialization.config.v1+json`: [Container config JSON](serialization.md#image-json-description)
-- `application/vnd.oci.image.serialization.combined.v1+json`: [Combined image JSON and filesystem changesets](serialization.md#combined-image-json--filesystem-changeset-format)
 
 ## Compatibility Matrix
 
@@ -39,10 +38,6 @@ This section shows where the OCI Image Specification is compatible with formats
 
 - [application/vnd.docker.container.image.v1+json](https://github.com/docker/docker/blob/master/image/spec/v1.md#image-json-description)
 
-### application/vnd.oci.image.serialization.combined.v1+json
-
-- [layout compatible with docker save/load format](https://github.com/opencontainers/image-spec/blob/master/serialization.md#combined-image-json--filesystem-changeset-format)
-
 ## Relations
 
 The following figure shows how the above media types reference each other:

diff --git a/schema/schema.go b/schema/schema.go
@@ -18,12 +18,11 @@ import "net/http"
 
 // Media types for the OCI image formats
 const (
-	MediaTypeDescriptor                 Validator     = `application/vnd.oci.descriptor.v1+json`
-	MediaTypeManifest                   Validator     = `application/vnd.oci.image.manifest.v1+json`
-	MediaTypeManifestList               Validator     = `application/vnd.oci.image.manifest.list.v1+json`
-	MediaTypeImageSerialization         unimplemented = `application/vnd.oci.image.serialization.rootfs.tar.gzip`
-	MediaTypeImageSerializationConfig   Validator     = `application/vnd.oci.image.serialization.config.v1+json`
-	MediaTypeImageSerializationCombined unimplemented = `application/vnd.oci.image.serialization.combined.v1+json`
+	MediaTypeDescriptor               Validator     = `application/vnd.oci.descriptor.v1+json`
+	MediaTypeManifest                 Validator     = `application/vnd.oci.image.manifest.v1+json`
+	MediaTypeManifestList             Validator     = `application/vnd.oci.image.manifest.list.v1+json`
+	MediaTypeImageSerialization       unimplemented = `application/vnd.oci.image.serialization.rootfs.tar.gzip`
+	MediaTypeImageSerializationConfig Validator     = `application/vnd.oci.image.serialization.config.v1+json`
 )
 
 var (