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

Merge remote-tracking branch 'origin/pr/163'

This commit is contained in:
Vincent Batts 2015-09-10 10:07:40 -04:00
parent b1510a7872 339e038400
commit 712a7467d1
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 strings for capabilities defined in [the man page](http://m
]
```
## 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",
```