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

Merge pull request #9439 from blakery/master

Browse source 
Cleanup: remove obsolete workaround
This commit is contained in:
Michael Crosby 2014-12-01 13:14:47 -08:00
commit 92c840c87d
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
daemon/create.go
View file

@ -53,12 +53,9 @@ func (daemon *Daemon) ContainerCreate(job *engine.Job) engine.Status {
job.Errorf("IPv4 forwarding is disabled.\n") job.Errorf("IPv4 forwarding is disabled.\n")
} }
container.LogEvent("create") container.LogEvent("create")
// FIXME: this is necessary because daemon.Create might return a nil container
// with a non-nil error. This should not happen! Once it's fixed we job.Printf("%s\n", container.ID)
// can remove this workaround.
if container != nil {
job.Printf("%s\n", container.ID)
}
for _, warning := range buildWarnings { for _, warning := range buildWarnings {
job.Errorf("%s\n", warning) job.Errorf("%s\n", warning)
} }
@ -108,6 +105,7 @@ func (daemon *Daemon) Create(config *runconfig.Config, hostConfig *runconfig.Hos
} }
return container, warnings, nil return container, warnings, nil
} }
func (daemon *Daemon) GenerateSecurityOpt(ipcMode runconfig.IpcMode) ([]string, error) { func (daemon *Daemon) GenerateSecurityOpt(ipcMode runconfig.IpcMode) ([]string, error) {
if ipcMode.IsHost() { if ipcMode.IsHost() {
return label.DisableSecOpt(), nil return label.DisableSecOpt(), nil