From b6d5a8cc1562a6507bc0a4b84c7e6478aa5f4ce2 Mon Sep 17 00:00:00 2001 From: Qiang Huang Date: Sun, 18 Jun 2017 18:10:48 +0800 Subject: [PATCH] Change platform ref from runtime-spec Signed-off-by: Qiang Huang --- config.md | 6 +++--- conversion.md | 2 -- image-index.md | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/config.md b/config.md index d4b593f25..116b6c16a 100644 --- a/config.md +++ b/config.md @@ -103,12 +103,12 @@ Note: Any OPTIONAL field MAY also be set to null, which is equivalent to being a - **architecture** *string*, REQUIRED The CPU architecture which the binaries in this image are built to run on. - Configurations SHOULD use, and implementations SHOULD understand, values [supported by runtime-spec's `platform.arch`][runtime-platform]. + Configurations SHOULD use, and implementations SHOULD understand, values listed in the Go Language document for [`GOARCH`][go-environment]. - **os** *string*, REQUIRED The name of the operating system which the image is built to run on. - Configurations SHOULD use, and implementations SHOULD understand, values [supported by runtime-spec's `platform.os`][runtime-platform]. + Configurations SHOULD use, and implementations SHOULD understand, values listed in the Go Language document for [`GOOS`][go-environment]. - **config** *object*, OPTIONAL @@ -271,5 +271,5 @@ Here is an example image configuration JSON document: ``` [rfc3339-s5.6]: https://tools.ietf.org/html/rfc3339#section-5.6 -[runtime-platform]: https://github.com/opencontainers/runtime-spec/blob/v1.0.0-rc3/config.md#platform +[go-environment]: https://golang.org/doc/install/source#environment [tar-split]: https://github.com/vbatts/tar-split diff --git a/conversion.md b/conversion.md index 19600ab63..2e3d5feae 100644 --- a/conversion.md +++ b/conversion.md @@ -30,8 +30,6 @@ A compliant configuration converter MUST extract the following fields verbatim t | Image Field | Runtime Field | Notes | | ------------------- | --------------- | ----- | -| `architecture` | `platform.arch` | | -| `os` | `platform.os` | | | `Config.WorkingDir` | `process.cwd` | | | `Config.Env` | `process.env` | 1 | | `Config.Entrypoint` | `process.args` | 2 | diff --git a/image-index.md b/image-index.md index adb8d6619..51697566a 100644 --- a/image-index.md +++ b/image-index.md @@ -46,12 +46,12 @@ For the media type(s) that this document is compatible with, see the [matrix][ma - **`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]. + Image indexes SHOULD use, and implementations SHOULD understand, values listed in the Go Language document for [`GOARCH`][go-environment2]. - **`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]. + Image indexes SHOULD use, and implementations SHOULD understand, values listed in the Go Language document for [`GOOS`][go-environment2]. - **`os.version`** *string* @@ -120,5 +120,5 @@ For the media type(s) that this document is compatible with, see the [matrix][ma } ``` -[runtime-platform2]: https://github.com/opencontainers/runtime-spec/blob/v1.0.0-rc3/config.md#platform +[go-environment2]: https://golang.org/doc/install/source#environment [matrix]: media-types.md#compatibility-matrix