kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix validation of plugins without rootfs in config

Browse source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 6c7cb52009)
This commit is contained in:
Tonis Tiigi 2016-12-27 15:36:12 -08:00
parent 25bbf8ab7c
commit f02d46f050
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugin/manager.go
View file

@ -301,6 +301,10 @@ func configToRootFS(c []byte) (*image.RootFS, error) {
if err := json.Unmarshal(c, &pluginConfig); err != nil { if err := json.Unmarshal(c, &pluginConfig); err != nil {
return nil, err return nil, err
} }
// validation for empty rootfs is in distribution code
if pluginConfig.Rootfs == nil {
return nil, nil
}
return rootFSFromPlugin(pluginConfig.Rootfs), nil return rootFSFromPlugin(pluginConfig.Rootfs), nil
} }