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

rebase

Browse Source
This commit is contained in:
Tuna 2016-08-05 00:46:12 +07:00
parent 37d51e7e10
commit 278d1dba8e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cli/app/app.go
View File

@ -766,7 +766,7 @@ func loadImage(service bundlefile.Service) (string, string) {
}
// Load DAB file into KomposeObject
func loadBundlesFile(file string, opt convertOptions) KomposeObject {
func loadBundlesFile(file string) KomposeObject {
komposeObject := KomposeObject{
ServiceConfigs: make(map[string]ServiceConfig),
}
@ -816,7 +816,7 @@ func loadBundlesFile(file string, opt convertOptions) KomposeObject {
}
// Load compose file into KomposeObject
func loadComposeFile(file string, opt convertOptions) KomposeObject {
func loadComposeFile(file string) KomposeObject {
komposeObject := KomposeObject{
ServiceConfigs: make(map[string]ServiceConfig),
}
@ -1153,10 +1153,10 @@ func Convert(c *cli.Context) {
}
if len(dabFile) > 0 {
komposeObject = loadBundlesFile(dabFile, opt)
komposeObject = loadBundlesFile(dabFile)
file = dabFile
} else {
komposeObject = loadComposeFile(inputFile, opt)
komposeObject = loadComposeFile(inputFile)
}
// Convert komposeObject to K8S controllers
@ -1221,9 +1221,9 @@ func Up(c *cli.Context) {
}
if len(dabFile) > 0 {
komposeObject = loadBundlesFile(dabFile, opt)
komposeObject = loadBundlesFile(dabFile)
} else {
komposeObject = loadComposeFile(inputFile, opt)
komposeObject = loadComposeFile(inputFile)
}
// Convert komposeObject to K8S controllers

2
cli/main/main.go
View File

@ -37,8 +37,8 @@ func main() {
app.Flags = append(command.CommonFlags())
app.Commands = []cli.Command{
command.ConvertCommand(),
command.UpCommand(),
// TODO: enable these commands and update docs once we fix them
//command.UpCommand(),
//command.PsCommand(),
//command.DeleteCommand(),
//command.ScaleCommand(),