add omitempty to 'Device' and 'Namespace'

Signed-off-by: liangchenye <liangchenye@huawei.com>
wking · Mar 11, 2016 · 28cc423 · 28cc423
1 parent dfd71f7
commit 28cc423
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/config.md b/config.md
@@ -404,12 +404,7 @@ Here is a full example `config.json` for reference.
             {
                 "type": "mount"
             }
-        ],
-        "devices": null,
-        "seccomp": {
-            "defaultAction": "",
-            "architectures": null
-        }
+        ]
     }
 }
 ```

diff --git a/specs-go/config.go b/specs-go/config.go
@@ -128,9 +128,9 @@ type Linux struct {
 	// If resources are specified, the cgroups at CgroupsPath will be updated based on resources.
 	CgroupsPath *string `json:"cgroupsPath,omitempty"`
 	// Namespaces contains the namespaces that are created and/or joined by the container
-	Namespaces []Namespace `json:"namespaces"`
+	Namespaces []Namespace `json:"namespaces,omitempty"`
 	// Devices are a list of device nodes that are created for the container
-	Devices []Device `json:"devices"`
+	Devices []Device `json:"devices,omitempty"`
 	// Seccomp specifies the seccomp security settings for the container.
 	Seccomp *Seccomp `json:"seccomp,omitempty"`
 	// RootfsPropagation is the rootfs mount propagation mode for the container.