Browse code
Fix --filter=desired_state behaviour
Just like `docker service tasks`, we should add `desired_state` filters
only in case there is no provided filters.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 3c194bd2a4fb4693deba366b3400c2efeeb90369)
Vincent Demeester authored on 2016/06/30 00:40:34Showing 1 changed files
| ... | ... |
@@ -55,7 +55,7 @@ func runTasks(dockerCli *client.DockerCli, opts tasksOptions) error {
|
| 55 | 55 |
|
| 56 | 56 |
filter := opts.filter.Value() |
| 57 | 57 |
filter.Add("node", node.ID)
|
| 58 |
- if !opts.all {
|
|
| 58 |
+ if !opts.all && !filter.Include("desired_state") {
|
|
| 59 | 59 |
filter.Add("desired_state", string(swarm.TaskStateRunning))
|
| 60 | 60 |
filter.Add("desired_state", string(swarm.TaskStateAccepted))
|
| 61 | 61 |
|