Perfect json content #646
Merged
Perfect json content #646
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zhouhao3
force-pushed
the
json-test
branch
2 times, most recently
from
b0228e5
to
1bd1fe3
Compare
wking
reviewed
Jan 5, 2017
| @@ -17,7 +17,7 @@ type Spec struct { | |||
| // Mounts configures additional mounts (on top of Root). | |||
| Mounts []Mount `json:"mounts,omitempty"` | |||
| // Hooks configures callbacks for container lifecycle events. | |||
| Hooks Hooks `json:"hooks"` | |||
| Hooks Hooks `json:"hooks,omitempty"` | |||
| @@ -13,5 +13,5 @@ type State struct { | |||
| // BundlePath is the path to the container's bundle directory. | |||
| BundlePath string `json:"bundlePath"` | |||
| // Annotations are the annotations associated with the container. | |||
| Annotations map[string]string `json:"annotations"` | |||
| Annotations map[string]string `json:"annotations,omitempty"` | |||
There was a problem hiding this comment.
The in-flight #507 is adding the associated REQUIRED and OPTIONAL wording to runtime.md.
There was a problem hiding this comment.
Since it is optional, it should not be so modified?
| @@ -89,7 +89,10 @@ | |||
| "id": "https://opencontainers.org/schema/bundle/linux/resources/pids/limit", | |||
| "$ref": "defs.json#/definitions/int64" | |||
| } | |||
| } | |||
| }, | |||
| "required": [ | |||
There was a problem hiding this comment.
Inconsistent indent. Try running make fmt from the schema directory.
| @@ -97,6 +118,10 @@ | |||
| "user": { | |||
| "id": "https://opencontainers.org/schema/bundle/process/user", | |||
| "type": "object", | |||
| "required": [ | |||
| "uid", | |||
| "gid" | |||
There was a problem hiding this comment.
These are only required on Linux/Solaris, and there's no way to enforce that constraint in JSON Schema without some serious oneOf hoop-jumping.
| @@ -170,8 +195,6 @@ | |||
| "ociVersion", | |||
| "platform", | |||
| "process", | |||
| "root", | |||
| "mounts", | |||
| "hooks" | |||
There was a problem hiding this comment.
Removing hooks is covered by the in-flight #427.
Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com>
|
LGTM |
|
LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: zhouhao zhouhao@cn.fujitsu.com