645bbecbd4
Merge pull request #23875 from tonistiigi/task-node-down
...
Do not show tasks from down nodes as active in ls
Upstream-commit: cf54dfba349627a24c6f7b8e035367a7a9f68f84
Component: engine
2016-06-24 10:07:25 +02:00
59b0cca4d4
For the lulz! (evalulate -> evaluate)
...
Signed-off-by: orkaa <orkica@gmail.com >
Upstream-commit: 1bdbfa57709586f9fa747c2323bc3cd3b03e90f0
Component: engine
2016-06-23 16:26:43 +02:00
a185c1fb92
Do not show tasks from down nodes as active in ls
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 5d4401d6d72c647fa61501c40949b2d67c3f958b
Component: engine
2016-06-22 14:49:24 -07:00
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
c30cfa209c
add more flag constants to service update.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 9d1f3373b3678033c1be197fafc55010cc8531dd
Component: engine
2016-06-20 11:03:36 -04:00
d329d8c654
Merge pull request #23708 from vieux/lower_mode
...
accept uppercase endpoint mode
Upstream-commit: 3911644782e7fdcbd8fae7a3fc86ffd4d99f191d
Component: engine
2016-06-17 23:20:17 -07:00
015b610f8c
accept uppercase endpoint mode
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 8a0c5f157892efdfd5119410adedf0f04c9c16cf
Component: engine
2016-06-17 19:06:12 -07:00
89ce4731a6
Change docker service update semantics
...
Change `docker service update` to replace attributes of the target
service rather than augment them. One particular occurrence where the
previous behavior proved problematic is when trying to update a port
mapping: the merge semantics provided no way of removing published
ports, but strictly of adding more.
The utility merge* functions where renamed accordingly to update*.
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: 1f8ab93b4422a88ef3053105c17acf1933576fbe
Component: engine
2016-06-17 17:09:40 -07:00
4c5a5698fd
Improve docker service inspect --pretty
...
Remove capitalization in placement, and remove spurious `\t`.
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: 3c60b7b9843276082c0ba4b868f354b9b44e9627
Component: engine
2016-06-17 11:38:19 -07:00
800ec66e2d
Merge pull request #23652 from dnephin/better-bundle-load-errors
...
Improve the error messages for loading a bundle
Upstream-commit: a3795ca13ef031b6b2a17fad488c839281cd1de2
Component: engine
2016-06-16 21:40:30 -07:00
c1713ee511
Merge pull request #23637 from vieux/add_more_fields_inspect
...
add some more fields in docker service inspect -p
Upstream-commit: edfd546a6f8d1d9c80e9ff3abba88a78d4ac3550
Component: engine
2016-06-17 01:40:26 +00:00
9dba03a4c5
add some more fields in docker service inspect -p
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 4c9e21b674046e8a3819cfbbb96f471bd280fba5
Component: engine
2016-06-16 16:22:11 -07:00
97ce44d0ef
Update ServiceInspectWithRaw
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 4a70cb55710a76ee7dfa059c440c34fd6cb84f16
Component: engine
2016-06-17 00:47:22 +02:00
b2b2e47716
Add some tests for bundlefile and improve the error messages for LoadFile
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c0ea589c1b27f8b68e84cfe6692a7639da52ce6d
Component: engine
2016-06-16 18:18:25 -04:00
bc035d4fca
Merge pull request #23640 from stevvooe/update-not-upate
...
api/client/service: fix minor spelling error in service inspect
Upstream-commit: 6dc58a1d58a476ed5dee42781aa3313a9472f566
Component: engine
2016-06-16 15:12:47 -07:00
73e75a98de
api/client/service: fix minor spelling error in service inspect
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 920e65ccbca0423c43579c9ce3b9331efe14c97b
Component: engine
2016-06-16 14:54:41 -07:00
40a223da0a
Merge pull request #23613 from stevvooe/running-over-replicas
...
api/client/service: list running services over replicas
Upstream-commit: 70c7328d9e97ab271bd4529480bdc7cc202faccf
Component: engine
2016-06-16 14:34:13 -07:00
8220c21f1c
Fix String() for some option types
...
and add unit tests for them.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c26e7d8c9105e16048268a01dd1e556af43902cd
Component: engine
2016-06-16 10:09:14 -04:00
d1beb37828
Merge pull request #23612 from icecrime/default_parallelism
...
Service `--update-parallelism` defauls to 0
Upstream-commit: 0d8ad60e086aa48dd16fbae3bfdf842d3b974c5a
Component: engine
2016-06-16 12:32:30 +02:00
dea0c27b09
Merge pull request #23572 from tombee/volume-opts-typo
...
Change 'invald' to 'invalid' in volume opts errors
Upstream-commit: e65c5b603e71245ffb2c2630fe986865d4d70f46
Component: engine
2016-06-16 05:17:30 +00:00
b8b934f883
api/client/service: list running services over replicas
...
To provide users a view of service status, list the number of running
task over the requested number of replicas.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: b86cb293ecc67e76ec90ec60766f52dad6903eac
Component: engine
2016-06-15 21:53:23 -07:00
8e989e5251
Service --update-parallelism defauls to 0
...
The `--update-parallelism` flaag should default to 0, which is
interpreted by the backend as unlimited. In other words, by default all
services should update simultaneously.
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: f22d0174f33e084445c5845c95aca346e187fb02
Component: engine
2016-06-15 21:13:04 -07:00
93b2574efc
Change SCALE to REPLICAS.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4df03499486a7f62f94bd1fb8e2625b0ef932fe5
Component: engine
2016-06-15 17:57:59 -04:00
f6a61ade82
Change 'invald' to 'invalid' in volume opts errors
...
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com >
Upstream-commit: bf988fc6ff90e1477d3fdab79cc7239511f32aba
Component: engine
2016-06-15 15:41:57 +01:00
d191ef8662
Merge pull request #23522 from docker/swarm-stack
...
Add experimental Docker Stack CLI commands
Upstream-commit: c0677565dc99c67edea0e109e86a7a3dbaca28ac
Component: engine
2016-06-15 02:22:01 +00:00
898d7aa097
prevent some panics in 'service update'
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 1d380243fcfaab2f4f82fa594e25aae3626ec03d
Component: engine
2016-06-14 15:37:27 -07:00
6d0da8f64f
Use constants for flag names.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 1b2c59bf86a67f7238df07b860234b02478f7371
Component: engine
2016-06-14 16:43:56 -04:00
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
9371e0d883
fix 2 potential panics with mounts in swarm
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: ffeb9fcb2a155f3495be333f9c6df41ea14c809b
Component: engine
2016-06-14 09:25:39 -07:00
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
