Skip to content

Commit

Permalink
Merge pull request opencontainers#397 from wking/punt-platform-to-run…
Browse files Browse the repository at this point in the history
…time-spec

config|manifest-list: Punt to runtime-spec for platform OS/arch
  • Loading branch information
vbatts authored Oct 19, 2016
2 parents 5faa0f2 + 826f7ee commit d4ca161
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
10 changes: 4 additions & 6 deletions config.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,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.
Possible values include: `386`, `amd64`, `arm`, `arm64`.
More values may be supported in the future and any of these may or may not be supported by a given container runtime implementation.
New entries SHOULD be submitted to this specification for standardization and be inspired by the [Go language documentation for $GOOS and $GOARCH](https://golang.org/doc/install/source#environment).
Configurations SHOULD use, and implementations SHOULD understand, values [supported by runtime-spec's `platform.arch`][runtime-platform].

- **os** *string*, REQUIRED

The name of the operating system which the image is built to run on.
Possible values include: `darwin`, `freebsd`, `linux`.
More values may be supported in the future and any of these may or may not be supported by a given container runtime implementation.
New entries SHOULD be submitted to this specification for standardization and be inspired by the [Go language documentation for $GOOS and $GOARCH](https://golang.org/doc/install/source#environment).
Configurations SHOULD use, and implementations SHOULD understand, values [supported by runtime-spec's `platform.os`][runtime-platform].

- **config** *object*, OPTIONAL

Expand Down Expand Up @@ -235,3 +231,5 @@ Here is an example image configuration JSON document:
]
}
```

[runtime-platform]: https://github.com/opencontainers/runtime-spec/blob/v1.0.0-rc2/config.md#platform
9 changes: 6 additions & 3 deletions manifest-list.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,16 @@ This section defines the `application/vnd.oci.image.manifest.list.v1+json` [medi
- **`platform`** *object*

This REQUIRED property describes the platform which the image in the manifest runs on.
A full list of valid operating system and architecture values are listed in the [Go language documentation for `$GOOS` and `$GOARCH`](https://golang.org/doc/install/source#environment)

- **`architecture`** *string*

This REQUIRED property specified the CPU architecture, for example `amd64` or `ppc64le`.
This REQUIRED property specified the CPU architecture.
Manifest lists SHOULD use, and implementations SHOULD understand, values [supported by runtime-spec's `platform.arch`][runtime-platform].

- **`os`** *string*

This REQUIRED property specifies the operating system, for example `linux` or `windows`.
This REQUIRED property specifies the operating system.
Manifest lists SHOULD use, and implementations SHOULD understand, values [supported by runtime-spec's `platform.os`][runtime-platform].

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

Expand Down Expand Up @@ -116,3 +117,5 @@ Instead they MUST ignore unknown properties.
}
}
```

[runtime-platform]: https://github.com/opencontainers/runtime-spec/blob/v1.0.0-rc2/config.md#platform

0 comments on commit d4ca161

Please sign in to comment.