This replaces the visitAll recursive function with a test that verifies that the option is set for all commands and subcommands, so that it doesn't have to be modified at runtime. We currently still have to loop over all functions for the setValidateArgs call, but that can be looked at separately. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
56 lines
1.3 KiB
Go
56 lines
1.3 KiB
Go
package container
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
|
|
"github.com/docker/cli/cli"
|
|
"github.com/docker/cli/cli/command"
|
|
"github.com/docker/cli/cli/command/completion"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
type waitOptions struct {
|
|
containers []string
|
|
}
|
|
|
|
// newWaitCommand creates a new cobra.Command for "docker container wait".
|
|
func newWaitCommand(dockerCLI command.Cli) *cobra.Command {
|
|
var opts waitOptions
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "wait CONTAINER [CONTAINER...]",
|
|
Short: "Block until one or more containers stop, then print their exit codes",
|
|
Args: cli.RequiresMinArgs(1),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
opts.containers = args
|
|
return runWait(cmd.Context(), dockerCLI, &opts)
|
|
},
|
|
Annotations: map[string]string{
|
|
"aliases": "docker container wait, docker wait",
|
|
},
|
|
ValidArgsFunction: completion.ContainerNames(dockerCLI, false),
|
|
DisableFlagsInUseLine: true,
|
|
}
|
|
|
|
return cmd
|
|
}
|
|
|
|
func runWait(ctx context.Context, dockerCLI command.Cli, opts *waitOptions) error {
|
|
apiClient := dockerCLI.Client()
|
|
|
|
var errs []error
|
|
for _, ctr := range opts.containers {
|
|
resultC, errC := apiClient.ContainerWait(ctx, ctr, "")
|
|
|
|
select {
|
|
case result := <-resultC:
|
|
_, _ = fmt.Fprintf(dockerCLI.Out(), "%d\n", result.StatusCode)
|
|
case err := <-errC:
|
|
errs = append(errs, err)
|
|
}
|
|
}
|
|
return errors.Join(errs...)
|
|
}
|