docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rebase

This commit is contained in:
Victor Vieux 2013-11-01 14:01:32 -07:00
parent f9901ead06
commit 7ddd4fe66a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
container.go
View File

@ -944,7 +944,7 @@ func (container *Container) Start() (err error) {
var lxcStart string = "lxc-start" var lxcStart string = "lxc-start"
if container.hostConfig.Privileged && container.runtime.capabilities.AppArmor { if container.hostConfig.Privileged && container.runtime.capabilities.AppArmor {
lxcStart = path.Join(container.runtime.config.GraphPath, "lxc-start-unconfined") lxcStart = path.Join(container.runtime.config.Root, "lxc-start-unconfined")
} }
container.cmd = exec.Command(lxcStart, params...) container.cmd = exec.Command(lxcStart, params...)
// Setup logging of stdout and stderr to disk // Setup logging of stdout and stderr to disk
@ -1116,7 +1116,7 @@ func (container *Container) allocateNetwork() error {
for port := range portSpecs { for port := range portSpecs {
binding := bindings[port] binding := bindings[port]
if hostConfig.PublishAllPorts && len(binding) == 0 { if container.hostConfig.PublishAllPorts && len(binding) == 0 {
binding = append(binding, PortBinding{}) binding = append(binding, PortBinding{})
} }
for i := 0; i < len(binding); i++ { for i := 0; i < len(binding); i++ {