mirror of https://github.com/docker/cli.git
updates for review comments
- runtimeUrl -> type_url - runtimes -> runtime Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
parent
06a91d315c
commit
58e69bfd5a
|
@ -46,7 +46,7 @@ func runList(dockerCli *command.DockerCli, opts listOptions) error {
|
||||||
client := dockerCli.Client()
|
client := dockerCli.Client()
|
||||||
|
|
||||||
serviceFilters := opts.filter.Value()
|
serviceFilters := opts.filter.Value()
|
||||||
serviceFilters.Add("runtimes", string(swarm.RuntimeContainer))
|
serviceFilters.Add("runtime", string(swarm.RuntimeContainer))
|
||||||
services, err := client.ServiceList(ctx, types.ServiceListOptions{Filters: serviceFilters})
|
services, err := client.ServiceList(ctx, types.ServiceListOptions{Filters: serviceFilters})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
|
@ -61,9 +61,9 @@ func runPS(dockerCli *command.DockerCli, opts psOptions) error {
|
||||||
for _, service := range opts.services {
|
for _, service := range opts.services {
|
||||||
// default to container runtime
|
// default to container runtime
|
||||||
serviceIDFilter.Add("id", service)
|
serviceIDFilter.Add("id", service)
|
||||||
serviceIDFilter.Add("runtimes", string(swarmtypes.RuntimeContainer))
|
serviceIDFilter.Add("runtime", string(swarmtypes.RuntimeContainer))
|
||||||
serviceNameFilter.Add("name", service)
|
serviceNameFilter.Add("name", service)
|
||||||
serviceNameFilter.Add("runtimes", string(swarmtypes.RuntimeContainer))
|
serviceNameFilter.Add("runtime", string(swarmtypes.RuntimeContainer))
|
||||||
}
|
}
|
||||||
serviceByIDList, err := client.ServiceList(ctx, types.ServiceListOptions{Filters: serviceIDFilter})
|
serviceByIDList, err := client.ServiceList(ctx, types.ServiceListOptions{Filters: serviceIDFilter})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -19,7 +19,7 @@ func getStackFilter(namespace string) filters.Args {
|
||||||
|
|
||||||
func getServiceFilter(namespace string) filters.Args {
|
func getServiceFilter(namespace string) filters.Args {
|
||||||
filter := getStackFilter(namespace)
|
filter := getStackFilter(namespace)
|
||||||
filter.Add("runtimes", string(swarm.RuntimeContainer))
|
filter.Add("runtime", string(swarm.RuntimeContainer))
|
||||||
return filter
|
return filter
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue