33bb05c194
Merge pull request #23281 from yongtang/23211-spf13-cobra-update
...
Use spf13/cobra for docker update
Upstream-commit: e5a8a7747ef8b9ac6ed4e508cd16a5cf2a44485c
Component: engine
2016-06-24 14:31:53 -07:00
e535398871
Merge pull request #23935 from LK4D4/fix_net_create_use
...
cli: fix network create usage
Upstream-commit: 824290a37e09f3411ceec439566c1e6c968a80ed
Component: engine
2016-06-24 16:55:12 -04:00
1d708b7135
Merge pull request #23933 from yp-engineering/service-log-typo
...
Fixing typo on service log output.
Upstream-commit: b73b303b1c974ea6d168eebdc2011b0802999ff1
Component: engine
2016-06-24 11:56:31 -07:00
41c3862b06
cli: fix network create usage
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 159e7341ad80d6926fd9c09585afcc2abda25415
Component: engine
2016-06-24 09:32:39 -07:00
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
852cc7fc30
Fixing typo on service log output.
...
Signed-off-by: Adam Avilla <aavilla@yp.com >
Upstream-commit: 7cc6fe575895dca6c50c4eadb0fd4c4986d05048
Component: engine
2016-06-23 14:54:40 -07: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
c04403422d
Merge pull request #23829 from LK4D4/cleanup_unused
...
api,daemon: cleanup some unused stuff
Upstream-commit: 506234e3f0f6d8f8a0629e09f38dfe96ada025c2
Component: engine
2016-06-22 11:58:57 -07:00
266d9f9808
Merge pull request #23832 from tonistiigi/unify-swarm-init-update
...
Unify swarm init and update options
Upstream-commit: df6630f6a3c08548f355a255e18f01c9fcb0ad86
Component: engine
2016-06-22 11:56:07 -07:00
82ca53bf58
Use spf13/cobra for docker update
...
This fix is part of the effort to convert commands to spf13/cobra #23211 .
Thif fix coverted command `docker update` to use spf13/cobra
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 9765593c5f7cdd3ef16dbd0cae35bb68cf5542ef
Component: engine
2016-06-22 11:06:44 -07:00
8c9dd4362c
Unify swarm init and update options
...
Add api side validation and defaults for init and
join requests.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: fb3eb1c27ef5520571c599ead8a72b343748db39
Component: engine
2016-06-21 16:34:32 -07:00
44cb4a4db6
api,daemon: cleanup some unused stuff
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ed5d335e22143b35f928e5a8740b046c21db808b
Component: engine
2016-06-21 14:15:19 -07:00
923b4bd8ef
fix some typos
...
Signed-off-by: bin liu <liubin0329@gmail.com >
Upstream-commit: 950073aabb305db6156709ea8509b1f72ff06f3b
Component: engine
2016-06-21 15:29:25 +08:00
17b17e3e6c
Merge pull request #23399 from tkopczynski/23211-info-command
...
Migrate info command to cobra
Upstream-commit: e7fd7848688719221853886e9871baa5b09953c1
Component: engine
2016-06-20 09:38:53 -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
22e8ff931c
Use flag constants for swarm flag.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c08a50dbd1bac8a0bf1c9be5e617273c19a54a2e
Component: engine
2016-06-20 11:04:37 -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
225672de47
Merge pull request #23731 from WeiZhang555/fix-help
...
Make --help information consistent
Upstream-commit: 70e47c4f75589e2ca46934b0f3c07b3ad87eb92d
Component: engine
2016-06-19 16:12:09 -07:00
3ab13e9c6a
Make --help information consistent
...
Other docker command always print "[OPTIONS]" right after `docker
COMMAND`, but `build` and `push` has inconsistent help message.
This commit will fix help information format.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 0e5397633628ab154fae33152de7dc1fd4e122db
Component: engine
2016-06-19 16:26:23 +08:00
b8c843c318
Fix docker start error with renamed container
...
This fix tries to fix the issue raised in #23716 where `docker start`
causes an error of `No such container:` if the container has been
renamed before `docker start` returns.
The issue is that `docker start` use container name passed at the
beginning to check for exit code at the end of the `docker start`.
This fix addresses the issue by always use container's `ID` to get
the information during `docker start`.
Additional integration tests have been added to cover this fix.
This fix fixes #23716 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 6e86733b47faf0d7629751987346022544b65cb7
Component: engine
2016-06-18 16:43:30 -07:00
da04c716c2
Merge pull request #23703 from tiborvass/carry-23694
...
Carry 23694: Default port for listen addr
Upstream-commit: a3b6ab04f6b53454282beaee548e8f1630ccd70c
Component: engine
2016-06-18 06:25:57 +00: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
480d3f4e51
Add tests for AutoAcceptOption
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c544649874bfecf2e6b8a00a0b25db309d81cf94
Component: engine
2016-06-17 19:43:38 -07:00
5fe17becef
Support a listen addr without a port, and add tests.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 595e79b805fd6e96d2e6c8876f7c9734164f5db7
Component: engine
2016-06-17 19:43:38 -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
65c6cdf69c
Migrate info command to cobra
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl >
Upstream-commit: ac7a663c0b0ae147f42048dbc19e933635e22f75
Component: engine
2016-06-17 22:11:33 +02: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
