From 9bbfd296f7dd8c79ea957671b7fc41b701e41dbe Mon Sep 17 00:00:00 2001 From: Blake Geno Date: Mon, 1 Dec 2014 11:44:13 -0500 Subject: [PATCH] remove obsolete workaround Signed-off-by: Blake Geno Upstream-commit: 9200fdd197f7c80c495597104928596516b36f41 Component: engine --- components/engine/daemon/create.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/components/engine/daemon/create.go b/components/engine/daemon/create.go index e666e6f6ff..65bdf28d9c 100644 --- a/components/engine/daemon/create.go +++ b/components/engine/daemon/create.go @@ -53,12 +53,9 @@ func (daemon *Daemon) ContainerCreate(job *engine.Job) engine.Status { job.Errorf("IPv4 forwarding is disabled.\n") } 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 - // can remove this workaround. - if container != nil { - job.Printf("%s\n", container.ID) - } + + job.Printf("%s\n", container.ID) + for _, warning := range buildWarnings { job.Errorf("%s\n", warning) } @@ -108,6 +105,7 @@ func (daemon *Daemon) Create(config *runconfig.Config, hostConfig *runconfig.Hos } return container, warnings, nil } + func (daemon *Daemon) GenerateSecurityOpt(ipcMode runconfig.IpcMode) ([]string, error) { if ipcMode.IsHost() { return label.DisableSecOpt(), nil