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

Merge pull request #79 from janetkuo/warnings-in-stdout

Browse Source 
Enable warnings in stdout
This commit is contained in:
Janet Kuo 2016-08-04 09:54:05 -07:00 committed by GitHub
commit 2010cefec8
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cli/app/app.go
View File

@ -747,9 +747,7 @@ func loadBundlesFile(file string, opt convertOptions) KomposeObject {
}
for name, service := range bundle.Services {
if !opt.toStdout {
checkUnsupportedKey(service)
}
checkUnsupportedKey(service)
serviceConfig := ServiceConfig{}
serviceConfig.Command = service.Command
serviceConfig.Args = service.Args
@ -823,9 +821,7 @@ func loadComposeFile(file string, opt convertOptions) KomposeObject {
composeServiceNames := composeObject.ServiceConfigs.Keys()
for _, name := range composeServiceNames {
if composeServiceConfig, ok := composeObject.ServiceConfigs.Get(name); ok {
if !opt.toStdout {
checkUnsupportedKey(composeServiceConfig)
}
checkUnsupportedKey(composeServiceConfig)
serviceConfig := ServiceConfig{}
serviceConfig.Image = composeServiceConfig.Image
serviceConfig.ContainerName = composeServiceConfig.ContainerName
@ -989,7 +985,7 @@ func komposeConvert(komposeObject KomposeObject, opt convertOptions) {
var datasvc []byte
// 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)
} else if len(ports) != 0 {
// convert datasvc to json / yaml