Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

*: Add "Initiative" to OCI Runtime Specification and expand OCI #900

Merged
merged 2 commits into from
Aug 22, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
*: Add "Initiative" to OCI Runtime Specification
Catching up with e641611 (README: tweak title, 2016-09-16, #571).

Signed-off-by: W. Trevor King <wking@tremily.us>
  • Loading branch information
wking committed Jul 13, 2017
commit ef65f73b9f85d1d16d08ec567f6ef919a98ac2a0
4 changes: 2 additions & 2 deletions config.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ For all platform-specific configuration values, the scope defined below in the [

## <a name="configSpecificationVersion" />Specification version

* **`ociVersion`** (string, REQUIRED) MUST be in [SemVer v2.0.0][semver-v2.0.0] format and specifies the version of the Open Container Runtime Specification with which the bundle complies.
The Open Container Runtime Specification follows semantic versioning and retains forward and backward compatibility within major versions.
* **`ociVersion`** (string, REQUIRED) MUST be in [SemVer v2.0.0][semver-v2.0.0] format and specifies the version of the Open Container Initiative Runtime Specification with which the bundle complies.
The Open Container Initiative Runtime Specification follows semantic versioning and retains forward and backward compatibility within major versions.
For example, if a configuration is compliant with version 1.1 of this specification, it is compatible with all runtimes that support any 1.1 or later release of this specification, but is not compatible with a runtime that supports 1.0 and not 1.1.

### Example
Expand Down
2 changes: 1 addition & 1 deletion schema/config-schema.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"description": "Open Container Runtime Specification Container Configuration Schema",
"description": "Open Container Initiative Runtime Specification Container Configuration Schema",
"$schema": "http://json-schema.org/draft-04/schema#",
"id": "https://opencontainers.org/schema/bundle",
"type": "object",
Expand Down
4 changes: 2 additions & 2 deletions schema/defs.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"description": "Definitions used throughout the Open Container Runtime Specification",
"description": "Definitions used throughout the Open Container Initiative Runtime Specification",
"definitions": {
"int8": {
"type": "integer",
Expand Down Expand Up @@ -145,7 +145,7 @@
]
},
"ociVersion": {
"description": "The version of Open Container Runtime Specification that the document complies with",
"description": "The version of Open Container Initiative Runtime Specification that the document complies with",
"type": "string"
},
"annotations": {
Expand Down
2 changes: 1 addition & 1 deletion specs-go/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import "os"

// Spec is the base configuration for the container.
type Spec struct {
// Version of the Open Container Runtime Specification with which the bundle complies.
// Version of the Open Container Initiative Runtime Specification with which the bundle complies.
Version string `json:"ociVersion"`
// Process configures the container process.
Process *Process `json:"process,omitempty"`
Expand Down