Skip to content

Commit

Permalink
config: Move (u|g)idMappings from 'process' to 'linux'
Browse files Browse the repository at this point in the history
To match where they're defined in the JSON Schema [1].  The old
location is from d4e7326 (config: JSON examples, 2016-04-06, opencontainers#370),
and seems to have been accidental.

[1]: https://github.com/opencontainers/runtime-spec/blob/0982071b288ddddc1ae84d21c4bd682c96942f5c/schema/schema-linux.json#L21-L48

Signed-off-by: W. Trevor King <wking@tremily.us>
  • Loading branch information
wking authored and Ma Shimiao committed Aug 18, 2016
1 parent 1cc2c71 commit 5a0e7d7
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions config.md
Original file line number Diff line number Diff line change
Expand Up @@ -286,20 +286,6 @@ Here is a full example `config.json` for reference.
6
]
},
"uidMappings": [
{
"hostID": 1000,
"containerID": 0,
"size": 32000
}
],
"gidMappings": [
{
"hostID": 1000,
"containerID": 0,
"size": 32000
}
],
"args": [
"sh"
],
Expand Down Expand Up @@ -463,6 +449,20 @@ Here is a full example `config.json` for reference.
"gid": 0
}
],
"uidMappings": [
{
"hostID": 1000,
"containerID": 0,
"size": 32000
}
],
"gidMappings": [
{
"hostID": 1000,
"containerID": 0,
"size": 32000
}
],
"sysctl": {
"net.ipv4.ip_forward": "1",
"net.core.somaxconn": "256"
Expand Down

0 comments on commit 5a0e7d7

Please sign in to comment.