clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 21:51:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

small refactoring

Browse Source 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
This commit is contained in:
Victor Vieux
2014-07-11 23:43:21 +00:00
parent 8344b6d736
commit f3ff323fb3
3 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/execdriver/native/create.go
+1 -15
View File
@@ -14,7 +14,6 @@ import (
"github.com/dotcloud/docker/daemon/execdriver"
"github.com/dotcloud/docker/daemon/execdriver/native/configuration"
"github.com/dotcloud/docker/daemon/execdriver/native/template"
"github.com/dotcloud/docker/utils"
)
// createContainer populates and configures the container type with the
@@ -140,20 +139,7 @@ func (d *driver) setPrivileged(container *libcontainer.Config) (err error) {
}
func (d *driver) setCapabilities(container *libcontainer.Config, c *execdriver.Command) {
var caps []string
for _, cap := range container.Capabilities {
if !utils.StringsContains(c.CapDrop, cap) {
caps = append(caps, cap)
}
}
for _, cap := range c.CapAdd {
if !utils.StringsContains(caps, cap) {
caps = append(caps, cap)
}
}
container.Capabilities = caps
container.Capabilities = execdriver.TweakCapabilities(container.Capabilities, c.CapAdd, c.CapDrop)
}
func (d *driver) setupCgroups(container *libcontainer.Config, c *execdriver.Command) error {