toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bump libcontainer to 902c012e85cdae6bb68d8c7a0df69a42f818ce96

Browse Source 
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Upstream-commit: 753901343624f15264b46fe9ade01cf451be99f1
Component: engine
This commit is contained in:
Antonio Murdaca
2015-10-06 17:21:43 +02:00
parent 9d1d2940bc
commit e9bd508682
18 changed files with 341 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/daemon/execdriver/driver.go
View File

@ -150,7 +150,7 @@ type Resources struct {
CpusetMems string `json:"cpuset_mems"`
CPUPeriod int64 `json:"cpu_period"`
CPUQuota int64 `json:"cpu_quota"`
BlkioWeight int64 `json:"blkio_weight"`
BlkioWeight uint16 `json:"blkio_weight"`
Rlimits []*ulimit.Rlimit `json:"rlimits"`
OomKillDisable bool `json:"oom_kill_disable"`
MemorySwappiness int64 `json:"memory_swappiness"`

3
components/engine/daemon/execdriver/driver_unix.go
View File

@ -12,6 +12,7 @@ import (
"time"
"github.com/docker/docker/daemon/execdriver/native/template"
"github.com/docker/docker/pkg/mount"
"github.com/opencontainers/runc/libcontainer"
"github.com/opencontainers/runc/libcontainer/cgroups/fs"
"github.com/opencontainers/runc/libcontainer/configs"
@ -37,7 +38,7 @@ func InitContainer(c *Command) *configs.Config {
container.Devices = c.AutoCreatedDevices
container.Rootfs = c.Rootfs
container.Readonlyfs = c.ReadonlyRootfs
container.Privatefs = true
container.RootPropagation = mount.RPRIVATE
// check to see if we are running in ramdisk to disable pivot root
container.NoPivotRoot = os.Getenv("DOCKER_RAMDISK") != ""