Remove artifact manifest

The artifact manifest does not confer any additional benefits beyond the
existing image manifest. Drop it for the sake of backward compatibility.

Remove references to artifact.md, regenerate graph.

Signed-off-by: Jon Johnson <[email protected]>

Author: jonjohnsonjr

Makefile

@@ -30,7 +30,6 @@ DOC_FILES := \
 	descriptor.md \
 	image-layout.md \
 	manifest.md \
-	artifact.md \
 	image-index.md \
 	layer.md \
 	config.md \

annotations.md

@@ -16,10 +16,8 @@ This property contains arbitrary metadata.
 
 ## Pre-Defined Annotation Keys
 
-This specification defines the following annotation keys, intended for but not limited to [image index](image-index.md), image [manifest](manifest.md), [artifact](artifact.md), and [descriptor](descriptor.md) authors.
+This specification defines the following annotation keys, intended for but not limited to [image index](image-index.md), image [manifest](manifest.md), and [descriptor](descriptor.md) authors.
 
-* **org.opencontainers.artifact.created** date and time on which the artifact was built, conforming to [RFC 3339][rfc3339].
-* **org.opencontainers.artifact.description**: human readable description for the artifact (string)
 * **org.opencontainers.image.created** date and time on which the image was built, conforming to [RFC 3339][rfc3339].
 * **org.opencontainers.image.authors** contact details of the people or organization responsible for the image (freeform string)
 * **org.opencontainers.image.url** URL to find more information on the image (string)

artifact.md

@@ -55,14 +55,11 @@ The following fields contain the primary properties that constitute a Descriptor
 - **`artifactType`** *string*
 
   This OPTIONAL property contains the type of an artifact when the descriptor points to an artifact.
-  This is the value of `artifactType` when the descriptor references an [artifact manifest](artifact.md).
   This is the value of the config descriptor `mediaType` when the descriptor references an [image manifest](manifest.md).
   If defined, the value MUST comply with [RFC 6838][rfc6838], including the [naming requirements in its section 4.2][rfc6838-s4.2], and MAY be registered with [IANA][iana].
 
 Descriptors pointing to [`application/vnd.oci.image.manifest.v1+json`](manifest.md) SHOULD include the extended field `platform`, see [Image Index Property Descriptions](image-index.md#image-index-property-descriptions) for details.
 
-Descriptors pointing to [`application/vnd.oci.artifact.manifest.v1+json`](artifact.md) SHOULD include the extended field `artifactType`.
-
 ### Reserved
 
 Extended _Descriptor_ field additions proposed in other OCI specifications SHOULD first be considered for addition into this specification.
@@ -206,7 +203,7 @@ In the following example, the descriptor indicates the type of artifact it is re
 
 ```json,title=Content%20Descriptor&mediatype=application/vnd.oci.descriptor.v1%2Bjson
 {
-  "mediaType": "application/vnd.oci.artifact.manifest.v1+json",
+  "mediaType": "application/vnd.oci.image.manifest.v1+json",
   "size": 123,
   "digest": "sha256:87923725d74f4bfb94c9e86d64170f7521aad8221a5de834851470ca142da630",
   "artifactType": "application/vnd.example.sbom.v1"

descriptor.md

@@ -35,7 +35,6 @@ For the media type(s) that this document is compatible with, see the [matrix][ma
     Implementations MUST support at least the following media types:
 
     - [`application/vnd.oci.image.manifest.v1+json`](manifest.md)
-    - [`application/vnd.oci.artifact.manifest.v1+json`](artifact.md)
 
     Also, implementations SHOULD support the following media types:
 
@@ -157,14 +156,9 @@ When the variant of the CPU is not listed in the table, values are implementatio
       }
     },
     {
-      "mediaType": "application/vnd.oci.artifact.manifest.v1+json",
+      "mediaType": "application/vnd.oci.image.index.v1+json",
       "size": 7682,
-      "digest": "sha256:601570aaff1b68a61eb9c85b8beca1644e698003e0cdb5bce960f193d265a8b7",
-      "artifactType": "application/example",
-      "annotations": {
-          "com.example.artifactKey1": "value1",
-          "com.example.artifactKey2": "value2"
-        }
+      "digest": "sha256:601570aaff1b68a61eb9c85b8beca1644e698003e0cdb5bce960f193d265a8b7"
     }
   ],
   "annotations": {

image-index.md

@@ -4,7 +4,6 @@ digraph G {
     {
       rank=same
       manifest [shape=note, label="Image manifest\napplication/vnd.oci.image.manifest.v1+json"]
-      artifact [shape=note, label="Artifact Manifest\napplication/vnd.oci.artifact.manifest.v1+json"]
     }
     config [shape=note, label="Image config JSON\napplication/vnd.oci.image.config.v1+json"]
     layer [shape=note, label="Layer tar archive\napplication/vnd.oci.image.layer.v1.tar\napplication/vnd.oci.image.layer.v1.tar+gzip\napplication/vnd.oci.image.layer.nondistributable.v1.tar\napplication/vnd.oci.image.layer.nondistributable.v1.tar+gzip"]
@@ -14,9 +13,5 @@ digraph G {
   imageIndex -> manifest [label="1..*"]
   manifest -> config [label="1..1"]
   manifest -> layer [label="1..*"]
-  artifact -> manifest [label="0..1"] [constraint = false];
-  artifact -> artifact [label="0..1"];
   manifest -> manifest [label="0..1"];
-  artifact -> imageIndex [label="0..1"]
-  artifact -> layer[label="0..*"]
 }

img/media-types.dot

@@ -17,7 +17,6 @@ The goal of this specification is to enable the creation of interoperable tools
 - [Image Index](image-index.md)
 - [Filesystem Layers](layer.md)
 - [Image Configuration](config.md)
-- [Artifact Manifest](artifact.md)
 - [Annotations](annotations.md)
 - [Conversion](conversion.md)
 - [Considerations](considerations.md)
@@ -54,7 +53,6 @@ The high-level components of the spec include:
 
 * [Image Manifest](manifest.md) - a document describing the components that make up a container image
 * [Image Index](image-index.md) - an annotated list of manifests
-* [Artifact Manifest](artifact.md) - a document describing the components that make up an artifact
 * [Image Layout](image-layout.md) - a filesystem layout representing the contents of an image
 * [Filesystem Layer](layer.md) - a changeset that describes a container's filesystem
 * [Image Configuration](config.md) - a document determining layer ordering and configuration of the image suitable for translation into a [runtime bundle][runtime-spec]

img/media-types.png

@@ -72,7 +72,4 @@ const (
 
 	// MediaTypeScratch specifies the media type for an unused blob containing the value `{}`
 	MediaTypeScratch = "application/vnd.oci.scratch.v1+json"
-
-	// MediaTypeArtifactManifest specifies the media type for a content descriptor.
-	MediaTypeArtifactManifest = "application/vnd.oci.artifact.manifest.v1+json"
 )