From ef65f73b9f85d1d16d08ec567f6ef919a98ac2a0 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Thu, 13 Jul 2017 10:35:48 -0700 Subject: [PATCH 1/2] *: Add "Initiative" to OCI Runtime Specification Catching up with e641611f (README: tweak title, 2016-09-16, #571). Signed-off-by: W. Trevor King --- config.md | 4 ++-- schema/config-schema.json | 2 +- schema/defs.json | 4 ++-- specs-go/config.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config.md b/config.md index bee008f09..08f95026d 100644 --- a/config.md +++ b/config.md @@ -14,8 +14,8 @@ For all platform-specific configuration values, the scope defined below in the [ ## 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 diff --git a/schema/config-schema.json b/schema/config-schema.json index 5a49ba5ec..da3b3d0ef 100644 --- a/schema/config-schema.json +++ b/schema/config-schema.json @@ -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", diff --git a/schema/defs.json b/schema/defs.json index b8161ac87..377ec6d9f 100644 --- a/schema/defs.json +++ b/schema/defs.json @@ -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", @@ -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": { diff --git a/specs-go/config.go b/specs-go/config.go index f3f37d42d..71c9fa773 100644 --- a/specs-go/config.go +++ b/specs-go/config.go @@ -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"` From d4f835d4dd5bace400da1e7d86f667acb92e1dd9 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Thu, 13 Jul 2017 10:37:58 -0700 Subject: [PATCH 2/2] spec: Expand "OCI" in spec-title reference For consistency with the rest of the spec: $ git --no-pager grep --count 'Open Container Initiative Runtime Specification' README.md:1 config.md:2 schema/config-schema.json:1 schema/defs.json:2 spec.md:1 specs-go/config.go:1 $ git --no-pager grep --count 'OCI Runtime Specification' spec.md:1 Signed-off-by: W. Trevor King --- spec.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec.md b/spec.md index 3324eadc2..8bbe2203d 100644 --- a/spec.md +++ b/spec.md @@ -4,7 +4,7 @@ The [Open Container Initiative][oci] develops specifications for standards on Op # 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.