tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-21 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove the hidden flag from version, added --version and -v flags to root command.

Browse Source 
Signed-off-by: Shikachuu <zcmate@gmail.com>
This commit is contained in:
Shikachuu 2021-10-03 11:11:36 +02:00 committed by Nicolas De loof
parent 98fe57baac
commit fc8a433cee
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/compose/compose.go
View File

@ -222,6 +222,7 @@ func RootCommand(backend api.Service) *cobra.Command {
ansi string ansi string
noAnsi bool noAnsi bool
verbose bool verbose bool
version bool
) )
command := &cobra.Command{ command := &cobra.Command{
Short: "Docker Compose", Short: "Docker Compose",
@ -232,6 +233,9 @@ func RootCommand(backend api.Service) *cobra.Command {
if len(args) == 0 { if len(args) == 0 {
return cmd.Help() return cmd.Help()
} }
if version {
return versionCommand().Execute()
}
_ = cmd.Help() _ = cmd.Help()
return dockercli.StatusError{ return dockercli.StatusError{
StatusCode: compose.CommandSyntaxFailure.ExitCode, StatusCode: compose.CommandSyntaxFailure.ExitCode,
@ -304,6 +308,8 @@ func RootCommand(backend api.Service) *cobra.Command {
command.Flags().SetInterspersed(false) command.Flags().SetInterspersed(false)
opts.addProjectFlags(command.Flags()) opts.addProjectFlags(command.Flags())
command.Flags().StringVar(&ansi, "ansi", "auto", `Control when to print ANSI control characters ("never"|"always"|"auto")`) command.Flags().StringVar(&ansi, "ansi", "auto", `Control when to print ANSI control characters ("never"|"always"|"auto")`)
command.Flags().BoolVarP(&version, "version", "v", false, "Show the Docker Compose version information")
command.Flags().MarkHidden("version") //nolint:errcheck
command.Flags().BoolVar(&noAnsi, "no-ansi", false, `Do not print ANSI control characters (DEPRECATED)`) command.Flags().BoolVar(&noAnsi, "no-ansi", false, `Do not print ANSI control characters (DEPRECATED)`)
command.Flags().MarkHidden("no-ansi") //nolint:errcheck command.Flags().MarkHidden("no-ansi") //nolint:errcheck
command.Flags().BoolVar(&verbose, "verbose", false, "Show more output") command.Flags().BoolVar(&verbose, "verbose", false, "Show more output")

1
cmd/compose/version.go
View File

@ -37,7 +37,6 @@ func versionCommand() *cobra.Command {
Use: "version", Use: "version",
Short: "Show the Docker Compose version information", Short: "Show the Docker Compose version information",
Args: cobra.MaximumNArgs(0), Args: cobra.MaximumNArgs(0),
Hidden: true,
RunE: func(cmd *cobra.Command, _ []string) error { RunE: func(cmd *cobra.Command, _ []string) error {
runVersion(opts) runVersion(opts)
return nil return nil