From a044e07006fdfbc4dbbef4e23f1c2c98fce88230 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Sun, 15 May 2016 22:55:39 -0700 Subject: [PATCH] config.md: Remove 'solaris' from full example This should have been part of 759ee79c (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]: https://github.com/opencontainers/runtime-spec/pull/411#discussion_r61621001 Signed-off-by: W. Trevor King --- config.md | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/config.md b/config.md index cf1e0b697..5d88b2e7f 100644 --- a/config.md +++ b/config.md @@ -654,29 +654,6 @@ Here is a full example `config.json` for reference. ], "mountLabel": "system_u:object_r:svirt_sandbox_file_t:s0:c715,c811" }, - "solaris": { - "anet": [ - { - "allowedAddress": "172.17.0.2/16", - "configureAllowedAddress": "true", - "defrouter": "172.17.0.1/16", - "linkProtection": "mac-nospoof, ip-nospoof", - "linkname": "net0", - "lowerLink": "net2", - "macAddress": "02:42:f8:52:c7:16" - } - ], - "cappedCPU": { - "ncpus": "0.8" - }, - "cappedMemory": { - "physical": "1G", - "swap": "512m" - }, - "maxShmMemory": "256m", - "limitpriv": "default", - "milestone": "svc:/milestone/container:default" - }, "annotations": { "key1": "value1", "key2": "value2"