Skip to content

Commit d4ca161

Browse files
authored
Merge pull request opencontainers#397 from wking/punt-platform-to-runtime-spec
config|manifest-list: Punt to runtime-spec for platform OS/arch
2 parents 5faa0f2 + 826f7ee commit d4ca161

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

config.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,12 @@ Note: Any OPTIONAL field MAY also be set to null, which is equivalent to being a
6060
- **architecture** *string*, REQUIRED
6161

6262
The CPU architecture which the binaries in this image are built to run on.
63-
Possible values include: `386`, `amd64`, `arm`, `arm64`.
64-
More values may be supported in the future and any of these may or may not be supported by a given container runtime implementation.
65-
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).
63+
Configurations SHOULD use, and implementations SHOULD understand, values [supported by runtime-spec's `platform.arch`][runtime-platform].
6664

6765
- **os** *string*, REQUIRED
6866

6967
The name of the operating system which the image is built to run on.
70-
Possible values include: `darwin`, `freebsd`, `linux`.
71-
More values may be supported in the future and any of these may or may not be supported by a given container runtime implementation.
72-
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).
68+
Configurations SHOULD use, and implementations SHOULD understand, values [supported by runtime-spec's `platform.os`][runtime-platform].
7369

7470
- **config** *object*, OPTIONAL
7571

@@ -235,3 +231,5 @@ Here is an example image configuration JSON document:
235231
]
236232
}
237233
```
234+
235+
[runtime-platform]: https://github.com/opencontainers/runtime-spec/blob/v1.0.0-rc2/config.md#platform

manifest-list.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,16 @@ This section defines the `application/vnd.oci.image.manifest.list.v1+json` [medi
3737
- **`platform`** *object*
3838

3939
This REQUIRED property describes the platform which the image in the manifest runs on.
40-
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)
4140

4241
- **`architecture`** *string*
4342

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

4646
- **`os`** *string*
4747

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

5051
- **`os.version`** *string*
5152

@@ -116,3 +117,5 @@ Instead they MUST ignore unknown properties.
116117
}
117118
}
118119
```
120+
121+
[runtime-platform]: https://github.com/opencontainers/runtime-spec/blob/v1.0.0-rc2/config.md#platform

0 commit comments

Comments
 (0)