Merge pull request #91 from hqhq/hq_add_cgroup_mount

Add cgroup mount in the recommended config
This commit is contained in:
Mrunal Patel 2015-07-15 09:51:24 -07:00
commit 42aa891a6b
3 changed files with 13 additions and 1 deletions

View File

@ -111,6 +111,12 @@ user named `daemon` defined within that file-system.
"source": "sysfs", "source": "sysfs",
"destination": "/sys", "destination": "/sys",
"options": "nosuid,noexec,nodev" "options": "nosuid,noexec,nodev"
},
{
"type": "cgroup",
"source": "cgroup",
"destination": "/sys/fs/cgroup",
"options": "nosuid,noexec,nodev,relatime,ro"
} }
], ],
"linux": { "linux": {

View File

@ -184,7 +184,7 @@ func mountToRootfs(m *configs.Mount, rootfs, mountLabel string) error {
Device: "bind", Device: "bind",
Source: filepath.Join(mm.Mountpoint, dir), Source: filepath.Join(mm.Mountpoint, dir),
Destination: filepath.Join(m.Destination, strings.Join(mm.Subsystems, ",")), Destination: filepath.Join(m.Destination, strings.Join(mm.Subsystems, ",")),
Flags: syscall.MS_BIND | syscall.MS_REC | syscall.MS_RDONLY, Flags: syscall.MS_BIND | syscall.MS_REC | m.Flags,
}) })
} }
tmpfs := &configs.Mount{ tmpfs := &configs.Mount{

View File

@ -83,6 +83,12 @@ var specCommand = cli.Command{
Destination: "/sys", Destination: "/sys",
Options: "nosuid,noexec,nodev", Options: "nosuid,noexec,nodev",
}, },
{
Type: "cgroup",
Source: "cgroup",
Destination: "/sys/fs/cgroup",
Options: "nosuid,noexec,nodev,relatime,ro",
},
}, },
}, },
Linux: specs.Linux{ Linux: specs.Linux{