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

make --file as global flag

Browse Source
This commit is contained in:
Tuna 2016-09-02 23:55:31 +07:00
parent b2add4163f
commit 0bad1674b5
2 changed files with 11 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

@ -88,7 +88,7 @@ func validateFlags(opt kobject.ConvertOptions, singleOutput bool, dabFile, input
// Convert transforms docker compose or dab file to k8s objects // Convert transforms docker compose or dab file to k8s objects
func Convert(c *cli.Context) { func Convert(c *cli.Context) {
inputFile := c.String("file") inputFile := c.GlobalString("file")
dabFile := c.String("bundle") dabFile := c.String("bundle")
outFile := c.String("out") outFile := c.String("out")
generateYaml := c.BoolT("yaml") generateYaml := c.BoolT("yaml")
@ -170,7 +170,7 @@ func Up(c *cli.Context) {
} }
client := client.NewOrDie(clientConfig) client := client.NewOrDie(clientConfig)
inputFile := c.String("file") inputFile := c.GlobalString("file")
dabFile := c.String("bundle") dabFile := c.String("bundle")
komposeObject := kobject.KomposeObject{ komposeObject := kobject.KomposeObject{
@ -220,7 +220,7 @@ func Down(c *cli.Context) {
} }
client := client.NewOrDie(clientConfig) client := client.NewOrDie(clientConfig)
inputFile := c.String("file") inputFile := c.GlobalString("file")
dabFile := c.String("bundle") dabFile := c.String("bundle")
komposeObject := kobject.KomposeObject{ komposeObject := kobject.KomposeObject{

27
cli/command/command.go
View File

@ -32,12 +32,6 @@ func ConvertCommand() cli.Command {
app.Convert(c) app.Convert(c)
}, },
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.StringFlag{
Name: "file,f",
Usage: fmt.Sprintf("Specify an alternate compose file (default: %s)", app.DefaultComposeFile),
Value: app.DefaultComposeFile,
EnvVar: "COMPOSE_FILE",
},
cli.StringFlag{ cli.StringFlag{
Name: "bundle,dab", Name: "bundle,dab",
Usage: "Specify a Distributed Application Bundle (DAB) file", Usage: "Specify a Distributed Application Bundle (DAB) file",
@ -94,12 +88,6 @@ func UpCommand() cli.Command {
app.Up(c) app.Up(c)
}, },
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.StringFlag{
Name: "file,f",
Usage: fmt.Sprintf("Specify an alternative compose file (default: %s)", app.DefaultComposeFile),
Value: app.DefaultComposeFile,
EnvVar: "COMPOSE_FILE",
},
cli.StringFlag{ cli.StringFlag{
Name: "bundle,dab", Name: "bundle,dab",
Usage: "Specify a Distributed Application Bundle (DAB) file", Usage: "Specify a Distributed Application Bundle (DAB) file",
@ -118,12 +106,6 @@ func DownCommand() cli.Command {
app.Down(c) app.Down(c)
}, },
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.StringFlag{
Name: "file,f",
Usage: fmt.Sprintf("Specify an alternative compose file (default: %s)", app.DefaultComposeFile),
Value: app.DefaultComposeFile,
EnvVar: "COMPOSE_FILE",
},
cli.StringFlag{ cli.StringFlag{
Name: "bundle,dab", Name: "bundle,dab",
Usage: "Specify a Distributed Application Bundle (DAB) file", Usage: "Specify a Distributed Application Bundle (DAB) file",
@ -135,5 +117,12 @@ func DownCommand() cli.Command {
// CommonFlags defines the flags that are in common for all subcommands. // CommonFlags defines the flags that are in common for all subcommands.
func CommonFlags() []cli.Flag { func CommonFlags() []cli.Flag {
return []cli.Flag{} return []cli.Flag{
cli.StringFlag{
Name: "file,f",
Usage: fmt.Sprintf("Specify an alternative compose file (default: %s)", app.DefaultComposeFile),
Value: app.DefaultComposeFile,
EnvVar: "COMPOSE_FILE",
},
}
} }