Skip to content

Commit 3e7b8d0

Browse files
author
zhouhao
committed
Update the spec file
Signed-off-by: zhouhao <[email protected]>
1 parent 75d4c25 commit 3e7b8d0

File tree

2 files changed

+33
-27
lines changed

2 files changed

+33
-27
lines changed

descriptor.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ This section defines the `application/vnd.oci.descriptor.v1+json` [media type](m
1212
## Properties
1313

1414
A descriptor consists of a set of properties encapsulated in key-value fields.
15+
A descriptor pointing to certain types may include extended fields.
1516

1617
The following fields contain the primary properties that constitute a Descriptor:
1718

@@ -44,6 +45,37 @@ The following fields contain the primary properties that constitute a Descriptor
4445
This OPTIONAL property contains arbitrary metadata for this descriptor.
4546
This OPTIONAL property MUST use the [annotation rules](annotations.md#rules).
4647

48+
- **`platform`** *object*
49+
50+
This OPTIONAL property describes the platform which the image in the manifest runs on.
51+
This SHOULD only be used when referring to a manifest.
52+
53+
- **`architecture`** *string*
54+
55+
This REQUIRED property specifies the CPU architecture.
56+
Image indexes SHOULD use, and implementations SHOULD understand, values [supported by runtime-spec's `platform.arch`][runtime-platform2].
57+
58+
- **`os`** *string*
59+
60+
This REQUIRED property specifies the operating system.
61+
Image indexes SHOULD use, and implementations SHOULD understand, values [supported by runtime-spec's `platform.os`][runtime-platform2].
62+
63+
- **`os.version`** *string*
64+
65+
This OPTIONAL property specifies the operating system version, for example `10.0.10586`.
66+
67+
- **`os.features`** *array of strings*
68+
69+
This OPTIONAL property specifies an array of strings, each specifying a mandatory OS feature (for example on Windows `win32k`).
70+
71+
- **`variant`** *string*
72+
73+
This OPTIONAL property specifies the variant of the CPU, for example `armv6l` to specify a particular CPU variant of the ARM CPU.
74+
75+
- **`features`** *array of strings*
76+
77+
This OPTIONAL property specifies an array of strings, each specifying a mandatory CPU feature (for example `sse4` or `aes`).
78+
4779
### Reserved
4880

4981
The following field keys are reserved and MUST NOT be used by other specifications.

image-index.md

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ For the media type(s) that this document is compatible with, see the [matrix][ma
2525
This REQUIRED property contains a list of [manifests](manifest.md) for specific platforms.
2626
While this property MUST be present, the size of the array MAY be zero.
2727

28-
Each object in `manifests` has the base properties of [descriptor](descriptor.md) with the following additional properties and restrictions:
28+
Each object in `manifests` has the base properties of [descriptor](descriptor.md) with the following requirements and restrictions:
2929

3030
- **`mediaType`** *string*
3131

@@ -43,32 +43,6 @@ For the media type(s) that this document is compatible with, see the [matrix][ma
4343
This OPTIONAL property describes the platform which the image in the manifest runs on.
4444
This property SHOULD be present if its target is platform-specific.
4545

46-
- **`architecture`** *string*
47-
48-
This REQUIRED property specifies the CPU architecture.
49-
Image indexes SHOULD use, and implementations SHOULD understand, values [supported by runtime-spec's `platform.arch`][runtime-platform2].
50-
51-
- **`os`** *string*
52-
53-
This REQUIRED property specifies the operating system.
54-
Image indexes SHOULD use, and implementations SHOULD understand, values [supported by runtime-spec's `platform.os`][runtime-platform2].
55-
56-
- **`os.version`** *string*
57-
58-
This OPTIONAL property specifies the operating system version, for example `10.0.10586`.
59-
60-
- **`os.features`** *array of strings*
61-
62-
This OPTIONAL property specifies an array of strings, each specifying a mandatory OS feature (for example on Windows `win32k`).
63-
64-
- **`variant`** *string*
65-
66-
This OPTIONAL property specifies the variant of the CPU, for example `armv6l` to specify a particular CPU variant of the ARM CPU.
67-
68-
- **`features`** *array of strings*
69-
70-
This OPTIONAL property specifies an array of strings, each specifying a mandatory CPU feature (for example `sse4` or `aes`).
71-
7246
- **`annotations`** *string-string map*
7347

7448
This OPTIONAL property contains arbitrary metadata for the image index.

0 commit comments

Comments
 (0)