86bb1cfdfd
Block service mode change.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
Upstream-commit: 72f7cebfb036f0fc74b9fa6fcc0c154f83f1605f
Component: engine
2016-06-17 23:04:37 -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
a8956dca4d
Merge pull request #23692 from icecrime/tweak_pretty_service
...
Improve `docker service inspect --pretty`
Upstream-commit: 28768a6296a4ba370dbec8751179ab0bc88ad661
Component: engine
2016-06-17 20:08:08 +00:00
81bc9e5cf8
Merge pull request #23681 from tiborvass/plugins-fixes
...
Plugins fixes
Upstream-commit: 061bbaf7a4b363ffa9b2b04b8277761f28a4a289
Component: engine
2016-06-17 12:58:36 -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
516f943b0e
Merge pull request #23688 from tonistiigi/nl
...
Add newline to promote/demote message
Upstream-commit: 82c9410c41c7e34939d17fa5edcba2d1d0e4d686
Component: engine
2016-06-17 11:04:25 -07:00
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
82e43b2685
Merge pull request #23676 from avsm/swarm-cli-consistency
...
`docker swarm`: more consistent CLI help
Upstream-commit: 2bd34b858d7cc374169433eb0538a4dbe48cff3f
Component: engine
2016-06-17 10:55:15 -07:00
089ba4264f
Update plugin command with defaulttag
...
This way, you don't have to specify the ":latest" tag for some command
and not for others
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: cb321e82db662f5190a6d83a90677a9dd9fdcd31
Component: engine
2016-06-17 10:18:18 -07:00
eeb8ef5ac1
plugins: fix usage for plugin commands
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 65ed9daf70ccf0027f4eac8049667130deb249ed
Component: engine
2016-06-17 10:03:30 -07:00
dc0392a7ed
plugins: install should not automatically accept all permissions
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 4b70d4561e4a9b57d80b70cfebc50831e230735a
Component: engine
2016-06-17 10:03:30 -07:00
e5e1b41404
Merge pull request #23675 from anusha-ragunathan/add_disable
...
Add disable flag for plugin Install.
Upstream-commit: 906c1dc5a07827d48bede8e73e4b8673f711eea0
Component: engine
2016-06-17 09:38:26 -07:00
79014c743c
Merge pull request #23674 from justincormack/accepted
...
Missing line feed after accepting node
Upstream-commit: 83658c5b64413ee6df4c64dcf98acbd407c6f570
Component: engine
2016-06-17 16:08:37 +00:00
6ddced327d
docker swarm: more consistent CLI help
...
This changes `docker swarm help` to be consistent with capitals
and removes full stops.
Before:
```
Commands:
init Initialize a Swarm.
join Join a Swarm as a node and/or manager.
update update the Swarm.
leave Leave a Swarm.
inspect Inspect the Swarm
```
After:
```
Commands:
init Initialize a Swarm
join Join a Swarm as a node and/or manager
update Update the Swarm
leave Leave a Swarm
inspect Inspect the Swarm
```
Signed-off-by: Anil Madhavapeddy <anil@docker.com >
Upstream-commit: 0ec78739ac7d8ec1579d1d4fd63cd207dc56e7c8
Component: engine
2016-06-17 16:34:06 +01:00
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
a9608bfa10
Add disable flag for plugin Install.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 22e781e8e3ae1d1ab62ddcda983cabfde2e08ad4
Component: engine
2016-06-17 07:48:43 -07:00
71af4dcb33
fix invalid typo in error message
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 2322ccb8fff46a4d3a84f3ef214cb473816374af
Component: engine
2016-06-17 15:27:54 +01: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
f381416006
Merge pull request #23647 from vieux/improve_messages_node_cmds
...
improve some messages in the node subcmds
Upstream-commit: 4c5f1a7e5bfb49647eeb76d20628c7daac65ef8d
Component: engine
2016-06-17 03:20:30 +00:00
bfa982122e
Merge pull request #23651 from tonistiigi/cert-expiry
...
Add cert-expiry to swarm update
Upstream-commit: f52c807650beb3bb0afe67bafd546792d7fa1422
Component: engine
2016-06-17 02:50:58 +00:00
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
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
1c57d98347
Add cert-expiry to swarm update
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 7d8d51aa9d0c1737ff7f97a3efac0a2ef0975b56
Component: engine
2016-06-16 18:06:02 -07:00
433425402a
Merge pull request #23549 from dmcgowan/reference-ui-updates
...
Do not show empty tags for digest references in output
Upstream-commit: 16a6987a001446c4ff7df3c6c66362dd76685b86
Component: engine
2016-06-17 00:47:49 +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
eaf07b6f62
Update docker plugin install code…
...
… for more consistency (api side).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 2c82337b0490dc0a5b8329d1f23c6bad00d8551b
Component: engine
2016-06-17 00:33:21 +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
dc3dc99c53
Merge pull request #23520 from yongtang/23500-docker-info-security
...
Add security info to `docker info`
Upstream-commit: 6b4e2ad90be9dd642219982d7591f73bd5abaae9
Component: engine
2016-06-16 15:15:33 -07: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
7b4f900246
Merge pull request #23606 from vieux/fix_secrets
...
fix docker swarm init/update --secret
Upstream-commit: 657703178798ac497a82c16b4fd9f1c0728c60f9
Component: engine
2016-06-16 14:24:35 -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
5445763ee1
Merge pull request #23583 from anusha-ragunathan/accept-perms
...
Add accept-permissions flag for install.
Upstream-commit: 6253c294947ef8ec64092bb612aafa45ff07f076
Component: engine
2016-06-16 12:44:37 +02: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
9bd6973edb
fix docker swarm init/update --secret
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 085895342c7f797f0eef7ec956438e33489f211f
Component: engine
2016-06-15 17:05:10 -07:00
d8d03043a3
Add basic integration tests for plugins.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: a2d48c9e4e2abadcba582de47891837b0a80b24c
Component: engine
2016-06-15 15:19:19 -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
dbd95f4e51
Add accept-permissions flag for install.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: ec4857da485768db8dadda3511122d136d896dde
Component: engine
2016-06-15 10:58:43 -07: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
d27484e0f7
Do not show empty tags for digest references in output
...
When a repository has a tag and digests, show tag for each digest value.
Do not duplicate rows for the same image name with both tag and digest.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 79eada38141dca71f5195df59882f1cb46657640
Component: engine
2016-06-14 22:44:49 -07:00
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
1de46d8dd4
Bump API Version to v1.25
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 04292192e023372453983cf6318f772922928c4e
Component: engine
2016-06-14 20:03:50 -07:00
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
09430f24ff
Merge pull request #23553 from icecrime/heartbeat_as_duration
...
Make `--dispatcher-heartbeat-period` a duration
Upstream-commit: 2e9aac59e20ee376da32c5c85e1b392fc555f9c9
Component: engine
2016-06-15 02:36:17 +00: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
