From 39fbc4ab9c435c09bd6af22aef099372b94bc9a7 Mon Sep 17 00:00:00 2001 From: Charlie Drage Date: Tue, 10 Jan 2017 09:45:17 -0500 Subject: [PATCH] Update checking to see if a default network has been provided Due to changes to libcompose, NetworkConfigs now returns a default network regardless if one has been provided or not. An if statement is added that will debug output and ignore the default network provided that it's the only network available. --- pkg/loader/compose/compose.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/loader/compose/compose.go b/pkg/loader/compose/compose.go index f8e4d59b..5a105219 100644 --- a/pkg/loader/compose/compose.go +++ b/pkg/loader/compose/compose.go @@ -81,11 +81,16 @@ func checkUnsupportedKey(composeProject *project.Project) []string { // collect all keys found in project var keysFound []string - // Root level keys - // volume config and network config are not supported - if len(composeProject.NetworkConfigs) > 0 { + // Root level keys are not yet supported + // Check to see if the default network is available and length is only equal to one. + // Else, warn the user that root level networks are not supported (yet) + if _, ok := composeProject.NetworkConfigs["default"]; ok && len(composeProject.NetworkConfigs) == 1 { + logrus.Debug("Default network found") + } else if len(composeProject.NetworkConfigs) > 0 { keysFound = append(keysFound, "root level networks") } + + // Root level volumes are not yet supported if len(composeProject.VolumeConfigs) > 0 { keysFound = append(keysFound, "root level volumes") }