rebase master

This commit is contained in:
Tuna
2016-08-12 10:38:33 +07:00
parent baedd92036
commit 469b50c33d
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -137,7 +137,7 @@ func (c *Compose) LoadFile(file string) kobject.KomposeObject {
for _, name := range composeServiceNames {
if composeServiceConfig, ok := composeObject.ServiceConfigs.Get(name); ok {
//FIXME: networks always contains one default element, even it isn't declared in compose v2.
if len(composeServiceConfig.Networks.Networks) > 0 &&
if composeServiceConfig.Networks != nil && len(composeServiceConfig.Networks.Networks) > 0 &&
composeServiceConfig.Networks.Networks[0].Name != "default" &&
!networksWarningFound {
logrus.Warningf("Unsupported key networks - ignoring")