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

Enable warnings in stdout

Browse Source
This commit is contained in:
Janet Kuo 2016-08-03 11:42:07 -07:00
parent 72fc1a2f42
commit dfc79632b8
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/app/app.go
View File

@ -747,9 +747,7 @@ func loadBundlesFile(file string, opt convertOptions) KomposeObject {
} }
for name, service := range bundle.Services { for name, service := range bundle.Services {
if !opt.toStdout {
checkUnsupportedKey(service) checkUnsupportedKey(service)
}
serviceConfig := ServiceConfig{} serviceConfig := ServiceConfig{}
serviceConfig.Command = service.Command serviceConfig.Command = service.Command
serviceConfig.Args = service.Args serviceConfig.Args = service.Args
@ -823,9 +821,7 @@ func loadComposeFile(file string, opt convertOptions) KomposeObject {
composeServiceNames := composeObject.ServiceConfigs.Keys() composeServiceNames := composeObject.ServiceConfigs.Keys()
for _, name := range composeServiceNames { for _, name := range composeServiceNames {
if composeServiceConfig, ok := composeObject.ServiceConfigs.Get(name); ok { if composeServiceConfig, ok := composeObject.ServiceConfigs.Get(name); ok {
if !opt.toStdout {
checkUnsupportedKey(composeServiceConfig) checkUnsupportedKey(composeServiceConfig)
}
serviceConfig := ServiceConfig{} serviceConfig := ServiceConfig{}
serviceConfig.Image = composeServiceConfig.Image serviceConfig.Image = composeServiceConfig.Image
serviceConfig.ContainerName = composeServiceConfig.ContainerName serviceConfig.ContainerName = composeServiceConfig.ContainerName
@ -989,7 +985,7 @@ func komposeConvert(komposeObject KomposeObject, opt convertOptions) {
var datasvc []byte var datasvc []byte
// If ports not provided in configuration we will not make service // If ports not provided in configuration we will not make service
if len(ports) == 0 && !opt.toStdout { if len(ports) == 0 {
logrus.Warningf("[%s] Service cannot be created because of missing port.", name) logrus.Warningf("[%s] Service cannot be created because of missing port.", name)
} else if len(ports) != 0 { } else if len(ports) != 0 {
// convert datasvc to json / yaml // convert datasvc to json / yaml