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

Fix nullptr panic in pending containers. 

Fixes #1289

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi 2015-10-19 13:38:06 -07:00
parent 894d1abd63
commit 0399a3c60b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/swarm/cluster.go
View File

@ -30,7 +30,10 @@ func (p *pendingContainer) ToContainer() *cluster.Container {
container := &cluster.Container{ container := &cluster.Container{
Container: dockerclient.Container{}, Container: dockerclient.Container{},
Config: p.Config, Config: p.Config,
Engine: p.Engine, Info: dockerclient.ContainerInfo{
HostConfig: &dockerclient.HostConfig{},
},
Engine: p.Engine,
} }
if p.Name != "" { if p.Name != "" {