jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #674 from crosbymichael/state 

Rename bundlePath to bundle
This commit is contained in:
Qiang Huang 2017-02-06 10:43:17 +08:00 committed by GitHub
parent ce0783aa1c 5d3f1674e6
commit 2392e66f16
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime.md
View File

@ -22,7 +22,7 @@ The value MAY be one of:
Additional values MAY be defined by the runtime, however, they MUST be used to represent new runtime states not defined above. Additional values MAY be defined by the runtime, however, they MUST be used to represent new runtime states not defined above.
* **`pid`** (int, REQUIRED when `status` is `created` or `running`) is the ID of the container process, as seen by the host. * **`pid`** (int, REQUIRED when `status` is `created` or `running`) is the ID of the container process, as seen by the host.
* **`bundlePath`** (string, REQUIRED) is the absolute path to the container's bundle directory. * **`bundle`** (string, REQUIRED) is the absolute path to the container's bundle directory.
This is provided so that consumers can find the container's configuration and root filesystem on the host. This is provided so that consumers can find the container's configuration and root filesystem on the host.
* **`annotations`** (map, OPTIONAL) contains the list of annotations associated with the container. * **`annotations`** (map, OPTIONAL) contains the list of annotations associated with the container.
If no annotations were provided then this property MAY either be absent or an empty map. If no annotations were provided then this property MAY either be absent or an empty map.
@ -37,7 +37,7 @@ When serialized in JSON, the format MUST adhere to the following pattern:
"id": "oci-container1", "id": "oci-container1",
"status": "running", "status": "running",
"pid": 4422, "pid": 4422,
"bundlePath": "/containers/redis", "bundle": "/containers/redis",
"annotations": { "annotations": {
"myKey": "myValue" "myKey": "myValue"
} }

6
schema/state-schema.json
View File

@ -27,8 +27,8 @@
"type": "integer", "type": "integer",
"minimum": 0 "minimum": 0
}, },
"bundlePath": { "bundle": {
"id": "https://opencontainers.org/schema/runtime/state/bundlePath", "id": "https://opencontainers.org/schema/runtime/state/bundle",
"type": "string" "type": "string"
}, },
"annotations": { "annotations": {
@ -40,6 +40,6 @@
"id", "id",
"status", "status",
"pid", "pid",
"bundlePath" "bundle"
] ]
} }

8
specs-go/state.go
View File

@ -6,12 +6,12 @@ type State struct {
Version string `json:"ociVersion"` Version string `json:"ociVersion"`
// ID is the container ID // ID is the container ID
ID string `json:"id"` ID string `json:"id"`
// Status is the runtime state of the container. // Status is the runtime status of the container.
Status string `json:"status"` Status string `json:"status"`
// Pid is the process ID for the container process. // Pid is the process ID for the container process.
Pid int `json:"pid"` Pid int `json:"pid"`
// BundlePath is the path to the container's bundle directory. // Bundle is the path to the container's bundle directory.
BundlePath string `json:"bundlePath"` Bundle string `json:"bundle"`
// Annotations are the annotations associated with the container. // Annotations are key values associated with the container.
Annotations map[string]string `json:"annotations,omitempty"` Annotations map[string]string `json:"annotations,omitempty"`
} }