Skip to content

Commit 339e038

Browse files
committed
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 <[email protected]>
1 parent 6cc6798 commit 339e038

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

config-linux.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,6 @@ Valid values are the string after `CAP_` for capabilities defined in [the man pa
1616
]
1717
```
1818

19-
## Rootfs Mount Propagation
20-
21-
rootfsPropagation sets the rootfs's mount propagation.
22-
Its value is either slave, private, or shared.
23-
[The kernel doc](https://www.kernel.org/doc/Documentation/filesystems/sharedsubtree.txt) has more information about mount propagation.
24-
25-
```json
26-
"rootfsPropagation": "slave",
27-
```
28-
2919
## User namespace mappings
3020

3121
```json

config_linux.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ type LinuxSpec struct {
1313
type Linux struct {
1414
// Capabilities are linux capabilities that are kept for the container.
1515
Capabilities []string `json:"capabilities"`
16-
// RootfsPropagation is the rootfs mount propagation mode for the container.
17-
RootfsPropagation string `json:"rootfsPropagation"`
1816
}
1917

2018
// User specifies linux specific user and group information for the container's

runtime-config-linux.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,3 +194,13 @@ The actions and operators are strings that match the definitions in seccomp.h fr
194194
]
195195
}
196196
```
197+
198+
## Rootfs Mount Propagation
199+
200+
rootfsPropagation sets the rootfs's mount propagation.
201+
Its value is either slave, private, or shared.
202+
[The kernel doc](https://www.kernel.org/doc/Documentation/filesystems/sharedsubtree.txt) has more information about mount propagation.
203+
204+
```json
205+
"rootfsPropagation": "slave",
206+
```

0 commit comments

Comments
 (0)