20fc079713
Don’t try to restore swarm from incomplete state
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: ded1d9af38cb467dadab0521936174eef0d4bc9e
Component: engine
2016-06-18 19:43:47 -07:00
69d60f8bcb
Update help output to match Docker 1.11.
...
* Also touch up headings.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: 17ae6539f6bfc20792d0a25b3f98adfce96e7337
Component: engine
2016-06-18 13:47:12 -07:00
e75e9b54a9
update cli commands output for rc1, revise key concepts
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 9499d5fd522e2fa31e5d0458c4eb9b420f164096
Component: engine
2016-06-18 11:38:27 -07:00
14409cb989
bad url
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: c2495dbe6d4961cb2b2eb975c4d4758ece0c8c45
Component: engine
2016-06-18 13:00:38 +00:00
e7f24f4bb5
href links are not converted from file.md by hugo
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: ad1819ca1d56a0e2caae2f0f28d14a456686e00b
Component: engine
2016-06-18 12:44:38 +00: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
cb1d5362ed
Merge pull request #23707 from mrjana/vendor
...
Vendoring swarmkit @3f135f206179e
Upstream-commit: b014d6a9174cb881dc8a7ff1ac258b343111a27e
Component: engine
2016-06-17 22:47:58 -07:00
1585ae60bd
Merge pull request #23671 from tombee/task-creation-log-debug
...
Change log.printf service creation msg to debug
Upstream-commit: 95074b57c6958cf89e870ddcacbe4ee80ef8b8ad
Component: engine
2016-06-17 20:23:33 -07:00
3baf108ef8
Merge pull request #23701 from icecrime/fix_update
...
Change `docker service update` semantics
Upstream-commit: 5e3d9d38b42d8141d305a373819bfa19c694eef9
Component: engine
2016-06-17 19:51:15 -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
467352d977
Vendoring swarmkit @3f135f206179e
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 64a567d24c147379dc79b54cf2140c4e7905c022
Component: engine
2016-06-17 19:01:18 -07:00
e21a14517a
Merge pull request #23665 from albers/fix-completion-service
...
fix bash completion for `docker service` subcommands
Upstream-commit: 2989e7b2a0f55b4c8ec4c21118a172295f1b03b7
Component: engine
2016-06-17 17:54:49 -07:00
6200f441cd
Add initial "service" docs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f565bc7ec964537a4e20bf5d4e497d15c0c9b5bf
Component: engine
2016-06-17 17:28:24 -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
531b88d2e3
Merge pull request #23658 from londoncalling/mac-win-install-updates
...
install mac and win pared down, link to d4mac, d4win, getting started…
Upstream-commit: 2b865dbc3a94675478a9d6faae480ff447cc75de
Component: engine
2016-06-18 07:49:04 +10:00
9b853ff739
install mac and win pared down, link to d4mac, d4win, getting started improved, added menu.md's
...
fixing links to d4mac and d4win
updates per @Sven and @theJeztah, fixing links, typos, menu definitions, etc.
updates per Sven's comments in the PR
removed duplicate line in tutorials menu.md
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 5bc730eda76351ab669a60a5fc95fd273e399d88
Component: engine
2016-06-17 14:46:35 -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
ebcef72412
Merge pull request #23687 from mrjana/vendor
...
Vendoring libnetwork @13be89d1cf79
Upstream-commit: bd8664499528a0a446c097da80938139104a933d
Component: engine
2016-06-17 12:05:56 -07:00
4552e85448
plugins: fix name handling for legacy plugins
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 8ba17b4823f9a1a40a405905613667d97bb24546
Component: engine
2016-06-17 12:02:05 -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
7c70b5ec64
Merge pull request #23550 from swernli/execTTYFix
...
Fixing bug in AttachStreams that would fail to close StdIn
Upstream-commit: c1dd933c029d425ad8f5c3787d9b591ca216e08f
Component: engine
2016-06-17 11:19:28 -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
f8e31ac03e
Merge pull request #23682 from mrjana/bug
...
Check if DriverState is valid before using in convert
Upstream-commit: 83e31c876516313d48e50311cc59f0675087eabb
Component: engine
2016-06-17 10:56:40 -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
095a6d0749
Merge pull request #23664 from leonhartX/i23017
...
fix #23017 , add zsh completion for dockerd
Upstream-commit: e72b7ee425d9be8c1ac64580596db69912025513
Component: engine
2016-06-17 19:44:43 +02:00
101ca2b440
Vendoring libnetwork @13be89d1cf79
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 70e2585d545e18757222b8ccfb21514fde7c42f4
Component: engine
2016-06-17 10:27:34 -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
bc663a35ec
plugins: remove automatic mounting of a state dir
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 15ff9de65801178a522c445ff9fb8964e21d12a0
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
def8da9f42
Check if DriverState is valid before using in convert
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 4fea81154b817b09e553308a1595bfd97a8c0582
Component: engine
2016-06-17 09:17:03 -07:00
297c4a4979
Merge pull request #23663 from albers/completion-swarm-update--cert-expiry
...
bash completion for `docker swarm update --cert-expiry`
Upstream-commit: 6d47b06094ffa04a6299b7c5a61beb3cbe2e655b
Component: engine
2016-06-17 18:15:56 +02: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
b282e08783
Change log.printf service creation msg to debug
...
Signed-off-by: tomwbarlow@gmail.com <tomwbarlow@gmail.com >
Upstream-commit: eed8d14ed16846f926e2d139e8232fbc2d4641e4
Component: engine
2016-06-17 15:03:11 +01:00
c653aa3775
fix bash completion for docker service subcommands
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 42f3b1f4adeb251e15ea0ca0af2a1e98cb9a7145
Component: engine
2016-06-17 09:49:46 +02:00
3a6f26e8f3
fix #23017 , add zsh completion for dockerd
...
Signed-off-by: Ke Xu <leonhartx.k@gmail.com >
Upstream-commit: bd1fc1e5c26b954fb35f7adda46d764d80a1a570
Component: engine
2016-06-17 16:16:13 +09:00
6b5e5294c2
bash completion for docker swarm update --cert-expiry
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: dc2fc75d4260767937d98ea81c51fdea148162b2
Component: engine
2016-06-17 08:49:06 +02:00
f2adde44a9
Merge pull request #23656 from sfsmithcha/check_cmd_line
...
update output for node commands, minor edits
Upstream-commit: 8f9c7fab24d777e5ade6ed75f01e15e4b0fde79c
Component: engine
2016-06-16 22:54:28 -07:00
913871096c
update output for node commands, minor edits
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 3b2132c2c7f277750edfd9fc76d73dbb9142fde2
Component: engine
2016-06-16 21:44:07 -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
