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
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
4ac77af3db
Merge pull request #23552 from vieux/prevent_panics
...
prevent some panics in 'service update'
Upstream-commit: aa1b507af6a0c17ea35301d911109db1bb88dd7d
Component: engine
2016-06-14 19:08:46 -07:00
0b871ed824
Make --dispatcher-heartbeat-period a duration
...
Make `--dispatcher-heartbeat-period` a duration in `docker swarm
update`, allowing to express the value as "5s", "1h", etc.
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: e6e1fd5d0657c3ab5b15c2984403e4a4e62ca2bb
Component: engine
2016-06-14 18:10:49 -07:00
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
3c08c9d8dd
Merge pull request #23446 from tiborvass/plugins-experimental
...
Plugins: experimental support for new plugin management
Upstream-commit: 6ed921dc38be582939966f71a01ec10f03ed531f
Component: engine
2016-06-14 20:32:14 -04:00
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
d3cd4d14aa
Merge pull request #23415 from aboch/ll
...
Allow user to specify container's link-local addresses
Upstream-commit: c97fdbe3c5954b2685a8b140f595f06b09191956
Component: engine
2016-06-14 15:47:54 -07:00
237e46e585
Merge pull request #23525 from dnephin/fix_service_update_repliacs
...
Fix service update replicas
Upstream-commit: a0e992eff7055e1300fdcdf955c109a9904b0e1d
Component: engine
2016-06-14 22:41:08 +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
6c19b5ff61
Allow user to specify container's link-local addresses
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 1c4efb6aa05026efce99a7a5bb7e710c0f1b3002
Component: engine
2016-06-14 14:28:33 -07:00
848e510213
plugins: experimental support for new plugin management
...
This patch introduces a new experimental engine-level plugin management
with a new API and command line. Plugins can be distributed via a Docker
registry, and their lifecycle is managed by the engine.
This makes plugins a first-class construct.
For more background, have a look at issue #20363 .
Documentation is in a separate commit. If you want to understand how the
new plugin system works, you can start by reading the documentation.
Note: backwards compatibility with existing plugins is maintained,
albeit they won't benefit from the advantages of the new system.
Signed-off-by: Tibor Vass <tibor@docker.com >
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: f37117045c5398fd3dca8016ea8ca0cb47e7312b
Component: engine
2016-06-14 14:20: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
83176e8d77
Add security info to docker info
...
The security infomation has already been added to `GET /info` in #21172 .
However, it is not part of the output of `docker info` yet.
This fix adds the security information to `docker info`.
Additional tests has been added to cover changes.
This fix fixes #23500 . This fix is related to #20909 , #21172 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: eee20b564ffae0b8c8043115c959f0f9d1869fed
Component: engine
2016-06-14 12:23:45 -07:00
4bf224e6e8
Remove CmdTag.
...
This file was accidentally re-added as part of a rebase.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 19d6960b5bab7598b15091e5d9e9ee3b24537511
Component: engine
2016-06-14 15:09:38 -04:00
9dddec0b2c
Merge pull request #22983 from mlaventure/multiple-runtimes
...
Add support for multiple runtimes
Upstream-commit: 6381ed14d13b57873eb985380e52c9ff4fd94b98
Component: engine
2016-06-14 11:59:34 -07: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
7636cd663b
Merge pull request #23523 from vieux/fix_mounts_swarm
...
fix 2 potential panics with mounts in swarm
Upstream-commit: 87f31e379d7440bc3d0896a7b964e4ed59b6249a
Component: engine
2016-06-14 14:44:19 -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
