jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Deduplicate the field of RootfsPropagation 

There are two RootfsPropagation fields, one is Linux.RootfsPropagation,
the other one is LinuxRuntime.RootfsPropagation. They are duplicated,
one of them should be removed.

The RootfsPropagation is definitely a runtime specific configuration,
so we remove the one of Linux.RootfsPropagation.

And the description of it is moved from config-linux.md to
runtime-config-linux.md.

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
This commit is contained in:
Lai Jiangshan 2015-09-09 23:27:37 +08:00
parent 6cc6798b87
commit 339e038400
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config-linux.md
View File

@ -16,16 +16,6 @@ Valid values are the string after `CAP_` for capabilities defined in [the man pa
]
```
## Rootfs Mount Propagation
rootfsPropagation sets the rootfs's mount propagation.
Its value is either slave, private, or shared.
[The kernel doc](https://www.kernel.org/doc/Documentation/filesystems/sharedsubtree.txt) has more information about mount propagation.
```json
"rootfsPropagation": "slave",
```
## User namespace mappings
```json

2
config_linux.go
View File

@ -13,8 +13,6 @@ type LinuxSpec struct {
type Linux struct {
// Capabilities are linux capabilities that are kept for the container.
Capabilities []string `json:"capabilities"`
// RootfsPropagation is the rootfs mount propagation mode for the container.
RootfsPropagation string `json:"rootfsPropagation"`
}
// User specifies linux specific user and group information for the container's

10
runtime-config-linux.md
View File

@ -194,3 +194,13 @@ The actions and operators are strings that match the definitions in seccomp.h fr
]
}
```
## Rootfs Mount Propagation
rootfsPropagation sets the rootfs's mount propagation.
Its value is either slave, private, or shared.
[The kernel doc](https://www.kernel.org/doc/Documentation/filesystems/sharedsubtree.txt) has more information about mount propagation.
```json
"rootfsPropagation": "slave",
```