1
0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Commit Graph

21 Commits

Author SHA1 Message Date
Alexander Morozov
f3ff9e9f18 Merge pull request #24173 from vdemeester/tasks-filter-service-node-by-name
Allow service and node filter to be name in `tasks` subcommands 
Upstream-commit: db75aa029d1843b3fdabb16c5cd9e1b3a99f39b2
Component: engine
2016-07-05 12:16:57 -07:00
Vincent Demeester
db7f1cc524 Merge pull request #24128 from thaJeztah/rename-desired_state-filter
rename desired_state filter to desired-state
Upstream-commit: b8988824616017a7ff4a13475dde23f7677aa21c
Component: engine
2016-07-01 18:34:02 +02:00
Tonis Tiigi
b73379e968 Update to new swarmkit/engine-api
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 9b652738363d92fbe6e43b3981cdcc94bdb72c76
Component: engine
2016-06-30 17:22:47 -07:00
Sebastiaan van Stijn
6b4b42d73a rename desired_state filter to desired-state
For consistency with other filters (such as
"is-official"), this renames the desired_state
filter to "desired-state".

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d761719eb4e45fbd6f092f6d0b4eb42206e298f6
Component: engine
2016-06-30 14:49:46 -07:00
Tibor Vass
c93d8a8a0f Merge pull request #24125 from vdemeester/24117-node-task-filter
Fix --filter=desired_state behaviour
Upstream-commit: 9d18fda08d3ae4d9654f1fc1ec7a1f8afefebf75
Component: engine
2016-06-30 14:08:05 -07:00
Alexander Morozov
edfdc3750d Merge pull request #24159 from yongtang/24090-docker-node-list-hostname
Use HOSTNAME in the output of `docker node ls`
Upstream-commit: 0f687aafafb1b3f3503e71e6a04e766cc85f4372
Component: engine
2016-06-30 09:28:57 -07:00
allencloud
939b820305 make cmd short short consistency and change docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 184afb92bf0bda1f47b5e1812ee1134328e272e2
Component: engine
2016-06-30 21:17:51 +08:00
Vincent Demeester
a50f4824a7 Allow service and node filter to be name…
… on `docker node tasks` and `docker service tasks` commands.
This changes is mainly server-side (between engine api and
swarmkit). There is just a check in `api/client/service/tasks.go` to
handle the special *self* meaning.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b0fc5a21f1138f48e0431a550c936e8908d72840
Component: engine
2016-06-30 15:09:03 +02:00
Yong Tang
8038d9fddd Use HOSTNAME in the output of docker node ls
This fix tries to address an issue raised in #24090 where
the title field of `docker node ls` use NAME instead of
HOSTNAME. Yet the content of this field is actually
hostname.

The fix makes needed changes for the output of
`docker node ls`.

An additional test has been added to cover the change in
this fix.

This fix fixes #24090.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 4bc91ceeb750db6a6270b2f1821cb0b2f30117fc
Component: engine
2016-06-29 19:54:16 -07:00
Vincent Demeester
a758d1d64d 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>
Upstream-commit: 3c194bd2a4fb4693deba366b3400c2efeeb90369
Component: engine
2016-06-29 17:40:34 +02:00
allencloud
aba19163d1 uppercase output in node inspect to keep consistency
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 89582e1a34a570c27232cd394d38f7fddf7e6520
Component: engine
2016-06-27 18:29:27 +08:00
Daniel Nephin
7768ca41d3 Remove dead code from node update.
Also share mode code between update commands
and use flag constants

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: cacaeab9db51f42c33872c6cce1adc3e55f1c9c5
Component: engine
2016-06-20 11:05:48 -04:00
Tonis Tiigi
5687ad8aed Add newline to promote/demote message
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 3386e3570a1251bbea5302d8b8e639aaf68436c3
Component: engine
2016-06-17 10:58:11 -07:00
Justin Cormack
c99aad7fca Missing line feed after accepting node
Avoids
```
root@swarmatorium:~# docker node accept 3dnh6k13o44np9fwl83e7gh80
Node 3dnh6k13o44np9fwl83e7gh80 accepted in the swarm.root@swarmatorium:~#
```

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: c34d752419f0e9c17aa759df1a8314974b0d17ed
Component: engine
2016-06-17 15:49:35 +01:00
Victor Vieux
a992434a69 improve some messages in the node subcmds
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: eb962235fbf1579cf36bb0582347e8639ec47205
Component: engine
2016-06-16 18:53:24 -07:00
Arnaud Porterie
5710cba08b Merge pull request #23555 from dperny/change-manager-status-col
Remove the node leader column, show leader as status.
Upstream-commit: 8821233282c187551213497f66248e42de02b167
Component: engine
2016-06-15 03:55:12 +00:00
Arnaud Porterie
f5c8d86b39 Merge pull request #23554 from vieux/node_update_name
fix docker node update via name
Upstream-commit: 9ba0504923879f65d880e3c928c3964d8cbefc6c
Component: engine
2016-06-15 02:36:42 +00:00
Drew Erny
921626ca90 Remove the node leader column, show leader as status.
Removes the leader column from node ls and shows whether a node is the
leader in the manager status column instead.

Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: 4104c1dc131b62c033c702719909815fba679774
Component: engine
2016-06-14 17:50:02 -07:00
Victor Vieux
888c53e84d fix docker node update via name
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 78a48af37bec95f010d3355e1434793ff266d12e
Component: engine
2016-06-14 15:55:34 -07:00
Daniel Nephin
a4f6628660 Add experimental docker stack commands
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 71104bb592dc98467d3828394eabcbe50ca22ae4
Component: engine
2016-06-14 14:56:35 -04:00
Daniel Nephin
e808aa4ed0 Add Swarm management CLI commands
As described in our ROADMAP.md, introduce new Swarm management commands
to call to the corresponding API endpoints.

This PR is fully backward compatible (joining a Swarm is an optional
feature of the Engine, and existing commands are not impacted).

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 12a00e60177ca42bfb1dd9ebd5dce1c7039da6dd
Component: engine
2016-06-13 22:17:15 -07:00