Skip to content

Commit

Permalink
Update the spec file
Browse files Browse the repository at this point in the history
Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com>
  • Loading branch information
zhouhao committed Apr 6, 2017
1 parent 75d4c25 commit 789cc5a
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 27 deletions.
31 changes: 31 additions & 0 deletions descriptor.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,37 @@ The following fields contain the primary properties that constitute a Descriptor
This OPTIONAL property contains arbitrary metadata for this descriptor.
This OPTIONAL property MUST use the [annotation rules](annotations.md#rules).

- **`platform`** *object*

This OPTIONAL property describes the platform which the image in the manifest runs on.
This SHOULD only be used when referring to a manifest.

- **`architecture`** *string*

This REQUIRED property specifies the CPU architecture.
Image indexes SHOULD use, and implementations SHOULD understand, values [supported by runtime-spec's `platform.arch`][runtime-platform2].

- **`os`** *string*

This REQUIRED property specifies the operating system.
Image indexes SHOULD use, and implementations SHOULD understand, values [supported by runtime-spec's `platform.os`][runtime-platform2].

- **`os.version`** *string*

This OPTIONAL property specifies the operating system version, for example `10.0.10586`.

- **`os.features`** *array of strings*

This OPTIONAL property specifies an array of strings, each specifying a mandatory OS feature (for example on Windows `win32k`).

- **`variant`** *string*

This OPTIONAL property specifies the variant of the CPU, for example `armv6l` to specify a particular CPU variant of the ARM CPU.

- **`features`** *array of strings*

This OPTIONAL property specifies an array of strings, each specifying a mandatory CPU feature (for example `sse4` or `aes`).

### Reserved

The following field keys are reserved and MUST NOT be used by other specifications.
Expand Down
28 changes: 1 addition & 27 deletions image-index.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ For the media type(s) that this document is compatible with, see the [matrix][ma
This REQUIRED property contains a list of [manifests](manifest.md) for specific platforms.
While this property MUST be present, the size of the array MAY be zero.

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

- **`mediaType`** *string*

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

- **`architecture`** *string*

This REQUIRED property specifies the CPU architecture.
Image indexes SHOULD use, and implementations SHOULD understand, values [supported by runtime-spec's `platform.arch`][runtime-platform2].

- **`os`** *string*

This REQUIRED property specifies the operating system.
Image indexes SHOULD use, and implementations SHOULD understand, values [supported by runtime-spec's `platform.os`][runtime-platform2].

- **`os.version`** *string*

This OPTIONAL property specifies the operating system version, for example `10.0.10586`.

- **`os.features`** *array of strings*

This OPTIONAL property specifies an array of strings, each specifying a mandatory OS feature (for example on Windows `win32k`).

- **`variant`** *string*

This OPTIONAL property specifies the variant of the CPU, for example `armv6l` to specify a particular CPU variant of the ARM CPU.

- **`features`** *array of strings*

This OPTIONAL property specifies an array of strings, each specifying a mandatory CPU feature (for example `sse4` or `aes`).

- **`annotations`** *string-string map*

This OPTIONAL property contains arbitrary metadata for the image index.
Expand Down

0 comments on commit 789cc5a

Please sign in to comment.