Skip to content

Commit

Permalink
chore: format JSON file make -C schema fmt
Browse files Browse the repository at this point in the history
Signed-off-by: Kijima Daigo <[email protected]>
  • Loading branch information
kijimaD committed Jun 10, 2024
1 parent 2d3f72e commit d4aa6d8
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 20 deletions.
10 changes: 5 additions & 5 deletions schema/config-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,11 @@
"priority": {
"$ref": "defs.json#/definitions/int32"
},
"flags": {
"type": "array",
"items": {
"$ref": "defs-linux.json#/definitions/SchedulerFlag"
}
"flags": {
"type": "array",
"items": {
"$ref": "defs-linux.json#/definitions/SchedulerFlag"
}
},
"runtime": {
"$ref": "defs.json#/definitions/uint64"
Expand Down
8 changes: 4 additions & 4 deletions schema/defs-zos.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@
],
"properties": {
"path": {
"$ref": "defs.json#/definitions/FilePath"
"$ref": "defs.json#/definitions/FilePath"
},
"type": {
"$ref": "#/definitions/FileType"
"$ref": "#/definitions/FileType"
},
"major": {
"$ref": "#/definitions/Major"
"$ref": "#/definitions/Major"
},
"minor": {
"$ref": "#/definitions/Minor"
"$ref": "#/definitions/Minor"
},
"fileMode": {
"$ref": "#/definitions/FileMode"
Expand Down
4 changes: 2 additions & 2 deletions schema/features-linux.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@
"idmap": {
"type": "object",
"properties": {
"enabled": {
"enabled": {
"type": "boolean"
}
}
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion schema/features-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"potentiallyUnsafeConfigAnnotations": {
"$ref": "defs.json#/definitions/ArrayOfStrings"
},
"linux": {
"linux": {
"$ref": "features-linux.json#/linux"
}
},
Expand Down
20 changes: 16 additions & 4 deletions schema/test/config/good/spec-example.json
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,14 @@
"createRuntime": [
{
"path": "/usr/bin/fix-mounts",
"args": ["fix-mounts", "arg1", "arg2"],
"env": [ "key1=value1"]
"args": [
"fix-mounts",
"arg1",
"arg2"
],
"env": [
"key1=value1"
]
},
{
"path": "/usr/bin/setup-network"
Expand All @@ -169,8 +175,14 @@
"createContainer": [
{
"path": "/usr/bin/mount-hook",
"args": ["-mount", "arg1", "arg2"],
"env": [ "key1=value1"]
"args": [
"-mount",
"arg1",
"arg2"
],
"env": [
"key1=value1"
]
}
],
"startContainer": [
Expand Down
3 changes: 1 addition & 2 deletions schema/test/config/good/zos-minimal.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
"root": {
"path": "rootfs"
},
"zos": {
}
"zos": {}
}
4 changes: 2 additions & 2 deletions schema/test/features/good/runc.json
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,10 @@
"SCMP_ARCH_X86_64"
],
"knownFlags": [
"SECCOMP_FILTER_FLAG_LOG"
"SECCOMP_FILTER_FLAG_LOG"
],
"supportedFlags": [
"SECCOMP_FILTER_FLAG_LOG"
"SECCOMP_FILTER_FLAG_LOG"
]
},
"apparmor": {
Expand Down

0 comments on commit d4aa6d8

Please sign in to comment.