Merge pull request opencontainers#333 from mrunalp/optional_seccomp

vbatts · vbatts · commit 5a606f46042e · 2016-03-08T12:48:49.000-05:00
Seccomp should be optional
diff --git a/config_linux.go b/config_linux.go
@@ -34,7 +34,7 @@ type Linux struct {
 	// Devices are a list of device nodes that are created for the container
 	Devices []Device `json:"devices"`
 	// Seccomp specifies the seccomp security settings for the container.
-	Seccomp Seccomp `json:"seccomp"`
+	Seccomp *Seccomp `json:"seccomp,omitempty"`
 	// RootfsPropagation is the rootfs mount propagation mode for the container.
 	RootfsPropagation string `json:"rootfsPropagation,omitempty"`
 }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ type Linux struct {`
`34`	`34`	`// Devices are a list of device nodes that are created for the container`
`35`	`35`	Devices []Device `json:"devices"`
`36`	`36`	`// Seccomp specifies the seccomp security settings for the container.`
`37`		- Seccomp Seccomp `json:"seccomp"`
	`37`	+ Seccomp *Seccomp `json:"seccomp,omitempty"`
`38`	`38`	`// RootfsPropagation is the rootfs mount propagation mode for the container.`
`39`	`39`	RootfsPropagation string `json:"rootfsPropagation,omitempty"`
`40`	`40`	`}`