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

Make --dab global flag

Browse Source
This commit is contained in:
Tomas Kral 2016-09-23 15:11:04 +02:00
parent fa46376dff
commit 3ce0519a82
No known key found for this signature in database
GPG Key ID: E690DA7E4F291FA6
2 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/app/app.go
View File

@ -107,7 +107,7 @@ func validateFlags(opt kobject.ConvertOptions, singleOutput bool, dabFile, input
// Convert transforms docker compose or dab file to k8s objects
func Convert(c *cli.Context) {
inputFile := c.GlobalString("file")
dabFile := c.String("bundle")
dabFile := c.GlobalString("bundle")
outFile := c.String("out")
generateYaml := c.BoolT("yaml")
toStdout := c.BoolT("stdout")
@ -189,7 +189,7 @@ func Up(c *cli.Context) {
client := client.NewOrDie(clientConfig)
inputFile := c.GlobalString("file")
dabFile := c.String("bundle")
dabFile := c.GlobalString("bundle")
komposeObject := kobject.KomposeObject{
ServiceConfigs: make(map[string]kobject.ServiceConfig),
@ -239,7 +239,7 @@ func Down(c *cli.Context) {
client := client.NewOrDie(clientConfig)
inputFile := c.GlobalString("file")
dabFile := c.String("bundle")
dabFile := c.GlobalString("bundle")
komposeObject := kobject.KomposeObject{
ServiceConfigs: make(map[string]kobject.ServiceConfig),

25
cli/command/command.go
View File

@ -32,11 +32,6 @@ func ConvertCommand() cli.Command {
app.Convert(c)
},
Flags: []cli.Flag{
cli.StringFlag{
Name: "bundle,dab",
Usage: "Specify a Distributed Application Bundle (DAB) file",
EnvVar: "DAB_FILE",
},
cli.StringFlag{
Name: "out,o",
Usage: "Specify file name in order to save objects into",
@ -87,13 +82,6 @@ func UpCommand() cli.Command {
Action: func(c *cli.Context) {
app.Up(c)
},
Flags: []cli.Flag{
cli.StringFlag{
Name: "bundle,dab",
Usage: "Specify a Distributed Application Bundle (DAB) file",
EnvVar: "DAB_FILE",
},
},
}
}
@ -105,19 +93,18 @@ func DownCommand() cli.Command {
Action: func(c *cli.Context) {
app.Down(c)
},
Flags: []cli.Flag{
cli.StringFlag{
Name: "bundle,dab",
Usage: "Specify a Distributed Application Bundle (DAB) file",
EnvVar: "DAB_FILE",
},
},
}
}
// CommonFlags defines the flags that are in common for all subcommands.
func CommonFlags() []cli.Flag {
return []cli.Flag{
cli.StringFlag{
Name: "bundle,dab",
Usage: "Specify a Distributed Application Bundle (DAB) file",
EnvVar: "DAB_FILE",
},
cli.StringFlag{
Name: "file,f",
Usage: fmt.Sprintf("Specify an alternative compose file (default: %s)", app.DefaultComposeFile),