Add more OCI options

- Sysctl
- CgroupsPath
- RootfsPropagation

Signed-off-by: Justin Cormack <justin.cormack@docker.com>

src/cmd/moby/config.go

@@ -65,6 +65,9 @@ type MobyImage struct {
 	Hostname          string
 	OomScoreAdj       int    `yaml:"oomScoreAdj"`
 	DisableOOMKiller  bool   `yaml:"disableOOMKiller"`
+	RootfsPropagation string `yaml:"rootfsPropagation"`
+	CgroupsPath       string `yaml:"cgroupsPath"`
+	Sysctl            map[string]string
 }
 
 // NewConfig parses a config file
@@ -349,7 +352,7 @@ func ConfigInspectToOCI(image *MobyImage, inspect types.ImageInspect) ([]byte, e
 	oci.Linux = &specs.Linux{
 		// UIDMappings
 		// GIDMappings
-		// Sysctl
+		Sysctl: image.Sysctl,
 		Resources: &specs.LinuxResources{
 			// Devices
 			DisableOOMKiller: &image.DisableOOMKiller,
@@ -360,11 +363,11 @@ func ConfigInspectToOCI(image *MobyImage, inspect types.ImageInspect) ([]byte, e
 			// HugepageLimits
 			// Network
 		},
-		// CgroupsPath
+		CgroupsPath: image.CgroupsPath,
 		Namespaces:  namespaces,
 		// Devices
 		// Seccomp
-		// RootfsPropagation
+		RootfsPropagation: image.RootfsPropagation,
 		// MaskedPaths
 		// ReadonlyPaths
 		// MountLabel