Skip to content

Commit

Permalink
Merge pull request #897 from crosbymichael/pids
Browse files Browse the repository at this point in the history
Make pid option on platforms other than linux
  • Loading branch information
tianon authored Jul 12, 2017
2 parents a7bc89b + d3c8849 commit 96de01b
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion runtime.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The state of a container includes the following properties:
* `stopped`: the container process has exited (step 7 in the [lifecycle](#lifecycle))

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` on Linux, OPTIONAL on other platforms) is the ID of the container process, as seen by the host.
* **`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.
* **`annotations`** (map, OPTIONAL) contains the list of annotations associated with the container.
Expand Down
1 change: 0 additions & 1 deletion schema/state-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
"ociVersion",
"id",
"status",
"pid",
"bundle"
]
}
2 changes: 1 addition & 1 deletion specs-go/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ type State struct {
// Status is the runtime status of the container.
Status string `json:"status"`
// Pid is the process ID for the container process.
Pid int `json:"pid"`
Pid int `json:"pid,omitempty"`
// Bundle is the path to the container's bundle directory.
Bundle string `json:"bundle"`
// Annotations are key values associated with the container.
Expand Down

0 comments on commit 96de01b

Please sign in to comment.