d38f397da1
Add validation for stack names to prevent an empty name resulting in _all_
stacks to be returned after filtering, which can result in removal of services
for all stacks if `--prune`, or `docker stack rm` is used.
Before this change;
docker stack deploy -c docker-compose.yml one
docker stack deploy -c docker-compose.yml two
docker stack deploy -c docker-compose.yml three
docker stack deploy -c docker-compose.yml --prune ''
Removing service one_web
Removing service two_web
Removing service three_web
After this change:
docker stack deploy -c docker-compose.yml one
docker stack deploy -c docker-compose.yml two
docker stack deploy -c docker-compose.yml three
docker stack deploy -c docker-compose.yml --prune ''
invalid stack name: ""
Other stack commands were updated as well:
Before this change;
docker stack deploy -c docker-compose.yml ''
Creating network _default
failed to create network _default: Error response from daemon: rpc error: code = InvalidArgument desc = name must be valid as a DNS name component
docker stack ps ''
nothing found in stack:
docker stack rm ''
Removing service one_web
Removing service three_web
Removing service two_web
After this change:
docker stack deploy -c docker-compose.yml ''
invalid stack name: ""
docker stack ps ''
invalid stack name: ""
docker stack rm ''
invalid stack name: ""
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
70 lines
1.8 KiB
Go
70 lines
1.8 KiB
Go
package swarm
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/docker/cli/cli/command"
|
|
"github.com/docker/cli/cli/command/formatter"
|
|
"github.com/docker/cli/cli/command/service"
|
|
"github.com/docker/cli/cli/command/stack/options"
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/api/types/filters"
|
|
)
|
|
|
|
// RunServices is the swarm implementation of docker stack services
|
|
func RunServices(dockerCli command.Cli, opts options.Services) error {
|
|
if err := validateStackName(opts.Namespace); err != nil {
|
|
return err
|
|
}
|
|
ctx := context.Background()
|
|
client := dockerCli.Client()
|
|
|
|
filter := getStackFilterFromOpt(opts.Namespace, opts.Filter)
|
|
services, err := client.ServiceList(ctx, types.ServiceListOptions{Filters: filter})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// if no services in this stack, print message and exit 0
|
|
if len(services) == 0 {
|
|
fmt.Fprintf(dockerCli.Err(), "Nothing found in stack: %s\n", opts.Namespace)
|
|
return nil
|
|
}
|
|
|
|
info := map[string]formatter.ServiceListInfo{}
|
|
if !opts.Quiet {
|
|
taskFilter := filters.NewArgs()
|
|
for _, service := range services {
|
|
taskFilter.Add("service", service.ID)
|
|
}
|
|
|
|
tasks, err := client.TaskList(ctx, types.TaskListOptions{Filters: taskFilter})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
nodes, err := client.NodeList(ctx, types.NodeListOptions{})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
info = service.GetServicesStatus(services, nodes, tasks)
|
|
}
|
|
|
|
format := opts.Format
|
|
if len(format) == 0 {
|
|
if len(dockerCli.ConfigFile().ServicesFormat) > 0 && !opts.Quiet {
|
|
format = dockerCli.ConfigFile().ServicesFormat
|
|
} else {
|
|
format = formatter.TableFormatKey
|
|
}
|
|
}
|
|
|
|
servicesCtx := formatter.Context{
|
|
Output: dockerCli.Out(),
|
|
Format: formatter.NewServiceListFormat(format, opts.Quiet),
|
|
}
|
|
return formatter.ServiceListWrite(servicesCtx, services, info)
|
|
}
|