beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
25207 commits 14 branches 412 tags 338 MiB
Commit graph

25207 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sebastiaan van Stijn
70e47c4f75 Merge pull request #23731 from WeiZhang555/fix-help 
Make --help information consistent
 2016-06-19 16:12:09 -07:00
Sebastiaan van Stijn
b644ab5a44 Merge pull request #23741 from sfsmithcha/add_links 
add links to swarm and service commands to swarm mode overview
 2016-06-19 15:59:19 -07:00
Charles Smith
c13c560196 add links to swarm and service commands to swarm mode overview 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-06-19 11:43:49 -07:00
Vincent Demeester
4cc70c921f Merge pull request #23723 from tonistiigi/incomplete-restore 
Don’t try to restore swarm from incomplete state
 2016-06-19 19:56:39 +02:00
Vincent Demeester
f01e8556bb Merge pull request #23736 from yongtang/06192016-reference-link 
Fix reference link error in Jenkins docs failure
 2016-06-19 18:24:55 +02:00
Yong Tang
1cb7fb4d2e Fix reference link error in Jenkins docs failure 
This fix fixes one of the Jenkins docs failure:
https://jenkins.dockerproject.org/job/docs-docker-pr/9754/

There are 7 errors. This fix addresses one:
`* link error: (in page engine/userguide/storagedriver/device-mapper-driver.md) ../../reference/commandline/dockerd/#storage-driver-options`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-06-19 08:50:13 -07:00
Sebastiaan van Stijn
6cc5c8a732 Merge pull request #23734 from yongtang/06192016-reference-link-deprecated-docs 
Add release tag reference links in deprecated.md
 2016-06-19 07:44:25 -07:00
Yong Tang
bc20354b09 Add release tag reference links in deprecated.md 
This fix adds a couple of missed release tag reference links in deprecated.md

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-06-19 06:13:57 -07:00
Vincent Demeester
ce72bf8028 Merge pull request #23720 from yongtang/23716-renaming-started-container 
Fix `docker start` error with renamed container
 2016-06-19 13:56:13 +02:00
Vincent Demeester
f480bda09f Merge pull request #23721 from mrjana/vendor 
Vendoring libnetwork @ab62dd6bf06bf0
 2016-06-19 12:09:19 +02:00
Zhang Wei
0e53976336 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>
 2016-06-19 16:26:23 +08:00
Alexander Morozov
98aa5fb2c0 Merge pull request #23719 from shurcooL/integration-cli-fix-style-issue 
integration-cli: Change "Dns" to "DNS".
 2016-06-18 21:33:24 -07:00
Tonis Tiigi
ded1d9af38 Don’t try to restore swarm from incomplete state 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-18 19:43:47 -07:00
Jana Radhakrishnan
663159e9ac Vendoring @ab62dd6bf06bf0 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2016-06-18 19:19:13 -07:00
Yong Tang
6e86733b47 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>
 2016-06-18 16:43:30 -07:00
Dmitri Shuralyov
8cf4133f37 integration-cli: Change "Dns" to "DNS". 
This fixes a minor lint/style issue, improves consistency.

According to Go style, which this project follows, acronyms should have
a consistent case. Source: https://github.com/golang/go/wiki/CodeReviewComments#initialisms

See https://github.com/docker/docker/pull/11310#discussion_r67394302.

Signed-off-by: Dmitri Shuralyov <shurcooL@gmail.com>
 2016-06-18 16:32:27 -07:00
Sebastiaan van Stijn
83f2feb72d Merge pull request #23717 from thaJeztah/carry-23482 
[carry 23482] Update inspect reference
 2016-06-18 13:52:01 -07:00
Charles Chan
17ae6539f6 Update help output to match Docker 1.11. 
* Also touch up headings.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
 2016-06-18 13:47:12 -07:00
Sebastiaan van Stijn
7dee5deb4d Merge pull request #23650 from sfsmithcha/rc1_updates 
update cli commands output for rc1, revise key concepts
 2016-06-18 12:37:55 -07:00
Charles Smith
9499d5fd52 update cli commands output for rc1, revise key concepts 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-06-18 11:38:27 -07:00
Harald Albers
e65f036e13 fix bash completion for docker {swarm,node} subcommands 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-06-18 10:28:20 -07:00
Harald Albers
19753ec84d correct sort order in new bash completions 
The completion for the new `docker service`, `docker swarm` and
`docker node` command families were partly added in non-alphabetical
order.

Signed-off-by: Harald Albers <github@albersweb.de>
 2016-06-18 09:54:44 -07:00
Mike Goelzer
5cf73a47f5 Add bash completion for docker service scale 
Signed-off-by: Mike Goelzer <mike.goelzer@docker.com>

Conflicts:
	contrib/completion/bash/docker
 2016-06-18 09:27:06 -07:00
Sebastiaan van Stijn
1d45334a1a Merge pull request #23713 from SvenDowideit/fix-more-links 
Fix more links
 2016-06-18 07:49:18 -07:00
Sven Dowideit
c2495dbe6d bad url 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-06-18 13:00:38 +00:00
Sven Dowideit
ad1819ca1d href links are not converted from file.md by hugo 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-06-18 12:44:38 +00:00
Arnaud Porterie
a3b6ab04f6 Merge pull request #23703 from tiborvass/carry-23694 
Carry 23694: Default port for listen addr
 2016-06-18 06:25:57 +00:00
Sebastiaan van Stijn
3911644782 Merge pull request #23708 from vieux/lower_mode 
accept uppercase endpoint mode
 2016-06-17 23:20:17 -07:00
Aaron Lehmann
b014d6a917 Merge pull request #23707 from mrjana/vendor 
Vendoring swarmkit @3f135f206179e
 2016-06-17 22:47:58 -07:00
Sebastiaan van Stijn
95074b57c6 Merge pull request #23671 from tombee/task-creation-log-debug 
Change log.printf service creation msg to debug
 2016-06-17 20:23:33 -07:00
Tõnis Tiigi
5e3d9d38b4 Merge pull request #23701 from icecrime/fix_update 
Change `docker service update` semantics
 2016-06-17 19:51:15 -07:00
Daniel Nephin
c544649874 Add tests for AutoAcceptOption 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-06-17 19:43:38 -07:00
Daniel Nephin
595e79b805 Support a listen addr without a port, and add tests. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-06-17 19:43:38 -07:00
Victor Vieux
8a0c5f1578 accept uppercase endpoint mode 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-06-17 19:06:12 -07:00
Jana Radhakrishnan
64a567d24c Vendoring swarmkit @3f135f206179e 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2016-06-17 19:01:18 -07:00
Sebastiaan van Stijn
2989e7b2a0 Merge pull request #23665 from albers/fix-completion-service 
fix bash completion for `docker service` subcommands
 2016-06-17 17:54:49 -07:00
Sebastiaan van Stijn
81478df9b2 Merge pull request #23702 from thaJeztah/docker-service-cli-docs 
Add initial "service" docs
 2016-06-17 17:53:46 -07:00
Sebastiaan van Stijn
f565bc7ec9
Add initial "service" docs 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-17 17:28:24 -07:00
Arnaud Porterie (icecrime)
1f8ab93b44
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>
 2016-06-17 17:09:40 -07:00
Charles Smith
78ebfaff1a update docker swarm cli 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-06-17 15:40:43 -07:00
Sven Dowideit
2b865dbc3a Merge pull request #23658 from londoncalling/mac-win-install-updates 
install mac and win pared down, link to d4mac, d4win, getting started…
 2016-06-18 07:49:04 +10:00
Victoria Bialas
5bc730eda7 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>
 2016-06-17 14:46:35 -07:00
Tomasz Kopczynski
ac7a663c0b Migrate info command to cobra 
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
 2016-06-17 22:11:33 +02:00
Arnaud Porterie
28768a6296 Merge pull request #23692 from icecrime/tweak_pretty_service 
Improve `docker service inspect --pretty`
 2016-06-17 20:08:08 +00:00
Tibor Vass
061bbaf7a4 Merge pull request #23681 from tiborvass/plugins-fixes 
Plugins fixes
 2016-06-17 12:58:36 -07:00
Tibor Vass
bd86644995 Merge pull request #23687 from mrjana/vendor 
Vendoring libnetwork @13be89d1cf79
 2016-06-17 12:05:56 -07:00
Tibor Vass
8ba17b4823 plugins: fix name handling for legacy plugins 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-06-17 12:02:05 -07:00
Arnaud Porterie (icecrime)
3c60b7b984
Improve docker service inspect --pretty 
Remove capitalization in placement, and remove spurious `\t`.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
 2016-06-17 11:38:19 -07:00
Alexander Morozov
c1dd933c02 Merge pull request #23550 from swernli/execTTYFix 
Fixing bug in AttachStreams that would fail to close StdIn
 2016-06-17 11:19:28 -07:00
Tibor Vass
82c9410c41 Merge pull request #23688 from tonistiigi/nl 
Add newline to promote/demote message
 2016-06-17 11:04:25 -07:00