From cf55cdc8c437a6d8d96581e23ae8a6562d318404 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Tue, 19 Apr 2016 22:16:47 -0700 Subject: [PATCH] config: Move (u|g)idMappings from 'process' to 'linux' To match where they're defined in the JSON Schema [1]. The old location is from d4e7326d (config: JSON examples, 2016-04-06, #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 --- config.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/config.md b/config.md index bb8c9a8e4..53e88c23e 100644 --- a/config.md +++ b/config.md @@ -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" ], @@ -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"