toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #24128 from thaJeztah/rename-desired_state-filter

Browse Source 
rename desired_state filter to desired-state
Upstream-commit: b8988824616017a7ff4a13475dde23f7677aa21c
Component: engine
This commit is contained in:
Vincent Demeester
2016-07-01 18:34:02 +02:00
committed by GitHub
parent 8a1c0cca14 6b4b42d73a
commit db7f1cc524
6 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/api/client/stack/tasks.go
View File

@ -48,9 +48,9 @@ func runTasks(dockerCli *client.DockerCli, opts tasksOptions) error {
filter := opts.filter.Value()
filter.Add("label", labelNamespace+"="+opts.namespace)
if !opts.all && !filter.Include("desired_state") {
filter.Add("desired_state", string(swarm.TaskStateRunning))
filter.Add("desired_state", string(swarm.TaskStateAccepted))
if !opts.all && !filter.Include("desired-state") {
filter.Add("desired-state", string(swarm.TaskStateRunning))
filter.Add("desired-state", string(swarm.TaskStateAccepted))
}
tasks, err := client.TaskList(ctx, types.TaskListOptions{Filter: filter})