Skip to content

Commit

Permalink
Change platform ref from runtime-spec
Browse files Browse the repository at this point in the history
Signed-off-by: Qiang Huang <[email protected]>
  • Loading branch information
hqhq committed Jun 18, 2017
1 parent d207df4 commit b6d5a8c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
6 changes: 3 additions & 3 deletions config.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
2 changes: 0 additions & 2 deletions conversion.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
6 changes: 3 additions & 3 deletions image-index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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*

Expand Down Expand Up @@ -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

0 comments on commit b6d5a8c

Please sign in to comment.