Skip to content

Commit

Permalink
Merge pull request opencontainers#900 from wking/oci-runtime-specific…
Browse files Browse the repository at this point in the history
…ation

*: Add "Initiative" to OCI Runtime Specification and expand OCI
  • Loading branch information
Michael Crosby authored Aug 22, 2017
2 parents 3294695 + d4f835d commit 2a67f81
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
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 spec.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The [Open Container Initiative][oci] develops specifications for standards on Op

# <a name="ociRuntimeSpecAbstract" />Abstract

The OCI Runtime Specification aims to specify the configuration, execution environment, and lifecycle of a container.
The Open Container Initiative Runtime Specification aims to specify the configuration, execution environment, and lifecycle of a container.

A container's configuration is specified as the `config.json` for the supported platforms and details the fields that enable the creation of a container.
The execution environment is specified to ensure that applications running inside a container have a consistent environment between runtimes along with common actions defined for the container's lifecycle.
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

0 comments on commit 2a67f81

Please sign in to comment.