Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-08-31 23:03:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Allow --format on docker context ls. Fixing VS Code extension shellout

Browse source
This commit is contained in:
Guillaume Tardif 2020-06-23 13:12:45 +02:00
parent 03f11e2953
commit ab39310771
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cli/cmd/context/ls.go
View file

@ -17,7 +17,6 @@
package context
import (
"context"
"errors"
"fmt"
"os"
@ -27,14 +26,16 @@ import (
"github.com/spf13/cobra"
"github.com/docker/api/cli/mobycli"
apicontext "github.com/docker/api/context"
"github.com/docker/api/context/store"
"github.com/docker/api/formatter"
)
type lsOpts struct {
quiet bool
json bool
quiet bool
json bool
format string
}
func (o lsOpts) validate() error {
@ -52,21 +53,26 @@ func listCommand() *cobra.Command {
Aliases: []string{"ls"},
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
return runList(cmd.Context(), opts)
return runList(cmd, opts)
},
}
cmd.Flags().BoolVarP(&opts.quiet, "quiet", "q", false, "Only show context names")
cmd.Flags().BoolVar(&opts.json, "json", false, "Format output as JSON")
cmd.Flags().StringVar(&opts.format, "format", "", "Format output as JSON")
return cmd
}
func runList(ctx context.Context, opts lsOpts) error {
func runList(cmd *cobra.Command, opts lsOpts) error {
err := opts.validate()
if err != nil {
return err
}
if opts.format != "" {
return mobycli.ExecCmd(cmd)
}
ctx := cmd.Context()
currentContext := apicontext.CurrentContext(ctx)
s := store.ContextStore(ctx)
contexts, err := s.List()