Skip to content

Commit a044e07

Browse files
committed
config.md: Remove 'solaris' from full example
This should have been part of 759ee79 (config: Add platform-specific entry for 'solaris', 2016-05-06, #431), since the example has platform.os set to 'linux'. There was some (brief) discussion of this point before the 'solaris' section landed [1], but the "should only be set if" wording landed in parallel via b373a15 (config: Split platform-specific configuration into its own section, 2016-05-02, #414), and I'd forgotten to go back and apply that logic to #411. Having a full Solaris example would be useful, but I think it should be a separate, Solaris-only example. [1]: #411 (comment) Signed-off-by: W. Trevor King <[email protected]>
1 parent be76764 commit a044e07

File tree

1 file changed

+0
-23
lines changed

1 file changed

+0
-23
lines changed

config.md

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -654,29 +654,6 @@ Here is a full example `config.json` for reference.
654654
],
655655
"mountLabel": "system_u:object_r:svirt_sandbox_file_t:s0:c715,c811"
656656
},
657-
"solaris": {
658-
"anet": [
659-
{
660-
"allowedAddress": "172.17.0.2/16",
661-
"configureAllowedAddress": "true",
662-
"defrouter": "172.17.0.1/16",
663-
"linkProtection": "mac-nospoof, ip-nospoof",
664-
"linkname": "net0",
665-
"lowerLink": "net2",
666-
"macAddress": "02:42:f8:52:c7:16"
667-
}
668-
],
669-
"cappedCPU": {
670-
"ncpus": "0.8"
671-
},
672-
"cappedMemory": {
673-
"physical": "1G",
674-
"swap": "512m"
675-
},
676-
"maxShmMemory": "256m",
677-
"limitpriv": "default",
678-
"milestone": "svc:/milestone/container:default"
679-
},
680657
"annotations": {
681658
"key1": "value1",
682659
"key2": "value2"

0 commit comments

Comments
 (0)