mirror of https://github.com/docker/compose.git
Do not pass global flags to context show
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
This commit is contained in:
parent
7cbbab1739
commit
6d2f085717
|
@ -46,7 +46,7 @@ func Command(opts *cliopts.GlobalOpts) *cobra.Command {
|
|||
createCommand(),
|
||||
listCommand(),
|
||||
removeCommand(),
|
||||
showCommand(opts),
|
||||
showCommand(),
|
||||
useCommand(opts),
|
||||
login.Command(),
|
||||
)
|
||||
|
|
|
@ -33,27 +33,26 @@ import (
|
|||
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
cliopts "github.com/docker/api/cli/options"
|
||||
apicontext "github.com/docker/api/context"
|
||||
"github.com/docker/api/context/store"
|
||||
)
|
||||
|
||||
func showCommand(opts *cliopts.GlobalOpts) *cobra.Command {
|
||||
func showCommand() *cobra.Command {
|
||||
return &cobra.Command{
|
||||
Use: "show",
|
||||
Short: "Print the current context",
|
||||
Args: cobra.NoArgs,
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
return runShow(cmd.Context(), opts)
|
||||
return runShow(cmd.Context())
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func runShow(ctx context.Context, opts *cliopts.GlobalOpts) error {
|
||||
s := store.ContextStore(ctx)
|
||||
func runShow(ctx context.Context) error {
|
||||
name := apicontext.CurrentContext(ctx)
|
||||
// Match behavior of existing CLI
|
||||
if name != store.DefaultContextName {
|
||||
s := store.ContextStore(ctx)
|
||||
if _, err := s.Get(name, nil); err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue