0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #14977 from jfrazelle/fix-lxc

Browse source 
fix lxc
This commit is contained in:
Jessie Frazelle 2015-07-24 16:43:46 -07:00
commit 935810bd20
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/execdriver/lxc/lxc_template.go
View file

@ -115,7 +115,7 @@ lxc.cgroup.blkio.weight = {{.Resources.BlkioWeight}}
{{if .Resources.OomKillDisable}}
lxc.cgroup.memory.oom_control = {{.Resources.OomKillDisable}}
{{end}}
{{if .Resources.MemorySwappiness}}
{{if gt .Resources.MemorySwappiness 0}}
lxc.cgroup.memory.swappiness = {{.Resources.MemorySwappiness}}
{{end}}
{{end}}

6
integration-cli/docker_cli_run_test.go
View file

@ -745,6 +745,7 @@ func (s *DockerSuite) TestRunCapAddALLDropNetAdminCanDownInterface(c *check.C) {
}
func (s *DockerSuite) TestRunGroupAdd(c *check.C) {
testRequires(c, NativeExecDriver)
out, _ := dockerCmd(c, "run", "--group-add=audio", "--group-add=dbus", "--group-add=777", "busybox", "sh", "-c", "id")
groupsList := "uid=0(root) gid=0(root) groups=10(wheel),29(audio),81(dbus),777"
@ -1033,7 +1034,7 @@ func (s *DockerSuite) TestRunDnsOptionsBasedOnHostResolvConf(c *check.C) {
// Test to see if a non-root user can resolve a DNS name and reach out to it. Also
// check if the container resolv.conf file has atleast 0644 perm.
func (s *DockerSuite) TestRunNonRootUserResolvName(c *check.C) {
testRequires(c, SameHostDaemon)
testRequires(c, SameHostDaemon, NativeExecDriver)
testRequires(c, Network)
dockerCmd(c, "run", "--name=testperm", "--user=default", "busybox", "ping", "-c", "1", "www.docker.io")
@ -2478,6 +2479,7 @@ func (s *DockerSuite) TestDevicePermissions(c *check.C) {
}
func (s *DockerSuite) TestRunCapAddCHOWN(c *check.C) {
testRequires(c, NativeExecDriver)
out, _ := dockerCmd(c, "run", "--cap-drop=ALL", "--cap-add=CHOWN", "busybox", "sh", "-c", "adduser -D -H newuser && chown newuser /home && echo ok")
if actual := strings.Trim(out, "\r\n"); actual != "ok" {
@ -2505,7 +2507,7 @@ func (s *DockerSuite) TestVolumeFromMixedRWOptions(c *check.C) {
}
func (s *DockerSuite) TestRunWriteFilteredProc(c *check.C) {
testRequires(c, Apparmor)
testRequires(c, Apparmor, NativeExecDriver)
testWritePaths := []string{
/* modprobe and core_pattern should both be denied by generic