diff --git a/README.md b/README.md index 5fe334d0..450cb3b9 100755 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ For example, if you have a Docker bundle like [`docker-compose-bundle.dsb`](./examples/docker-compose-bundle.dsb), you can convert it into Kubernetes deployments and services like this: ```console -$ kompose convert --bundle docker-compose-bundle.dsb +$ kompose --bundle docker-compose-bundle.dsb convert WARN[0000]: Unsupported key networks - ignoring file "redis-svc.json" created file "web-svc.json" created diff --git a/cli/app/app.go b/cli/app/app.go index 5ec7d87b..d927ca51 100644 --- a/cli/app/app.go +++ b/cli/app/app.go @@ -108,7 +108,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") @@ -194,7 +194,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), @@ -244,7 +244,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), diff --git a/cli/command/command.go b/cli/command/command.go index 784c7673..c24d9342 100644 --- a/cli/command/command.go +++ b/cli/command/command.go @@ -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), diff --git a/docs/user-guide.md b/docs/user-guide.md index 84902fee..7eaf8767 100644 --- a/docs/user-guide.md +++ b/docs/user-guide.md @@ -55,7 +55,7 @@ db-svc.json docker-compose-bundle.dsb docker-voting.yml redis-svc.json Using `--bundle, --dab` to specify a DAB file as below: ```console -$ kompose convert --bundle docker-compose-bundle.dsb +$ kompose --bundle docker-compose-bundle.dsb convert WARN[0000]: Unsupported key networks - ignoring file "redis-svc.json" created file "web-svc.json" created