deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Merge pull request #428 from surajssd/remove_unnecessary_objects

Browse Source 
removed unnecessary objects in compose.go
This commit is contained in:
Tomas Kral 2017-02-15 11:29:57 +01:00 committed by GitHub
commit fb042c7b20
1 changed files with 53 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/loader/compose/compose.go
View File

@ -307,16 +307,12 @@ func (c *Compose) LoadFile(files []string) kobject.KomposeObject {
logrus.Fatalf("Failed to load compose file: %v", err) logrus.Fatalf("Failed to load compose file: %v", err)
} }
// transform composeObject into komposeObject
composeServiceNames := composeObject.ServiceConfigs.Keys()
noSupKeys := checkUnsupportedKey(composeObject) noSupKeys := checkUnsupportedKey(composeObject)
for _, keyName := range noSupKeys { for _, keyName := range noSupKeys {
logrus.Warningf("Unsupported %s key - ignoring", keyName) logrus.Warningf("Unsupported %s key - ignoring", keyName)
} }
for _, name := range composeServiceNames { for name, composeServiceConfig := range composeObject.ServiceConfigs.All() {
if composeServiceConfig, ok := composeObject.ServiceConfigs.Get(name); ok {
serviceConfig := kobject.ServiceConfig{} serviceConfig := kobject.ServiceConfig{}
serviceConfig.Image = composeServiceConfig.Image serviceConfig.Image = composeServiceConfig.Image
serviceConfig.Build = composeServiceConfig.Build.Context serviceConfig.Build = composeServiceConfig.Build.Context
@ -373,7 +369,6 @@ func (c *Compose) LoadFile(files []string) kobject.KomposeObject {
komposeObject.ServiceConfigs[name] = serviceConfig komposeObject.ServiceConfigs[name] = serviceConfig
} }
}
return komposeObject return komposeObject
} }