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

25931 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tibor Vass
8a0acaa512 Merge pull request #24699 from dnephin/fixes_to_service_inspect 
Only show port name if set
 2016-07-15 16:02:02 -07:00
Sebastiaan van Stijn
80965a35c1 Merge pull request #24702 from londoncalling/fix-toolbox-description-docs 
fixed cut-and-paste error on description of Docker Toolbox
 2016-07-15 23:09:06 +02:00
Victoria Bialas
6f9e310831 fixed cut-and-paste error on description of Docker Toolbox 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-07-15 13:54:34 -07:00
Daniel Nephin
909c596fa5 Only show port name if set. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-15 16:02:04 -04:00
Tonis Tiigi
85b1fdf15c Increase timeout for swarm requests 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-07-15 11:03:08 -07:00
Sebastiaan van Stijn
9a9fc01af8 Merge pull request #24610 from sfsmithcha/rc4_tutorial_check 
update create swarm and add nodes to use the auto-generated join command
 2016-07-15 19:09:36 +02:00
Michael Crosby
50b3595697 Merge pull request #24690 from thaJeztah/add-new-maintainers 
Add new maintainers
 2016-07-15 09:49:30 -07:00
Anusha Ragunathan
21ecd5a93d Remove use of exec-root in plugins due to socket pathname limits. 
Unix sockets are limited to 108 bytes. As a result, we need to be
careful in not using exec-root as the parent directory for pluginID
(which is already 64 bytes), since it can result in socket path names
longer than 108 bytes. Use /tmp instead. Before this change, setting:
- dockerd --exec-root=/go/src/github.com/do passes
- dockerd --exec-root=/go/src/github.com/doc fails
After this change, there's no failure.

Also, write a volume plugins test to verify that the plugins socket
responds.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-07-15 09:17:29 -07:00
Alexander Morozov
f553362ae5 Merge pull request #24676 from coolljt0725/fix_24674 
Fix daemon panic use wrong graphdriver with --live-restore flag
 2016-07-15 08:44:01 -07:00
Alexander Morozov
c562e3d768 Merge pull request #24642 from tonistiigi/wait-open 
Wait for the reader fifo opening to block
 2016-07-15 08:42:18 -07:00
Sebastiaan van Stijn
d4b932131a
Add new maintainers 
As voted on per e-mail, adding
new maintainers to the list

Welcome!

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-15 17:34:26 +02:00
Vincent Demeester
80ec9fa284 Merge pull request #24638 from miaoyq/fix-docs-err 
Delete  redundant content of 'docs/extend/plugins.md'
 2016-07-15 17:04:11 +02:00
Justin Cormack
6ba6265d1a Document --oom-score-adj flag in docker run 
This was only mentioned in docker create documentation.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 14:11:54 +01:00
Sebastiaan van Stijn
983fc99509 Merge pull request #24668 from sdurrheimer/zsh-completion-service-endpoint-mode 
Update zsh completion for 'docker service {create,update} {--endpoint…
 2016-07-15 14:40:45 +02:00
Steve Durrheimer
2e6922a6d3
Update zsh completion for 'docker service {create,update} {--endpoint-mode,--mode}' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-07-15 14:36:18 +02:00
Sebastiaan van Stijn
a968f83c55 Merge pull request #24666 from sdurrheimer/zsh-completion-dockerd-oom-score-adjust 
Add zsh completion for 'dockerd --oom-score-adjust'
 2016-07-15 13:47:39 +02:00
Sebastiaan van Stijn
533853dc57 Merge pull request #24669 from hqhq/fix_aufs_docs 
Fix aufs docs
 2016-07-15 13:41:40 +02:00
Antonio Murdaca
790fb315f7 Merge pull request #24655 from tonistiigi/stats-test-fix 
Fix TestGetContainerStatsRmRunning test
 2016-07-15 11:49:37 +02:00
Vincent Demeester
2a888c02a6 Merge pull request #24667 from sdurrheimer/zsh-completion-docker-service-create-update-registry-auth 
Add zsh completion for 'docker service {create,update} --registry-auth'
 2016-07-15 11:15:55 +02:00
Vincent Demeester
d69fcf10cb Merge pull request #24665 from sdurrheimer/zsh-completion-run-network 
Rename zsh completion for 'docker {create,run} --net --net-alias' to …
 2016-07-15 11:15:35 +02:00
Vincent Demeester
0534c3b7d6 Merge pull request #24147 from PaulFurtado/fix_init_pidfile_dockerd 
Make docker daemon and init script agree on pidfile location
 2016-07-15 11:14:53 +02:00
Lei Jitang
d9e8cea1b6 Fix daemon panic use wrong graphdriver with --live-restore flag 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-07-15 05:05:28 -04:00
Steve Durrheimer
64f08906a2
Add zsh completion for 'docker service {create,update} --registry-auth' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-07-15 08:23:57 +02:00
Steve Durrheimer
5d29732bdf
Add zsh completion for 'dockerd --oom-score-adjust' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-07-15 08:16:15 +02:00
Steve Durrheimer
ba5d9f63a3
Rename zsh completion for 'docker {create,run} --net --net-alias' to '--network --network-alias' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-07-15 08:09:20 +02:00
Qiang Huang
92dfbc1e2d Fix aufs docs 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-07-15 13:57:38 +08:00
Yanqiang Miao
cfe9d2ff1e Delete redundant content of 'docs/extend/plugins.md' 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

Update plugins.md

Update plugins.md
 2016-07-15 11:26:10 +08:00
Tonis Tiigi
f5fb3c69fd Fix panic in stats test 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-07-14 17:30:57 -07:00
Sebastiaan van Stijn
9df2a825ba Merge pull request #24654 from crosbymichael/enable-systemctl 
Enable docker.socket and docker.service in fedora install docs
 2016-07-15 01:42:31 +02:00
Michael Crosby
6780bdcbad State that docker supports fedora 24 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-07-14 16:24:21 -07:00
Michael Crosby
7a93a87c1a Enable docker socket and service on fedora 
Make sure that the users enable both the socket and service for docker
as part of the default install instructions.  If both are not enabled
docker will not start at boot and restart containers.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-07-14 16:23:05 -07:00
Paul Furtado
acb41ddc9d Change $prog back to docker in sysvinit-redhat 
(and set $exec to dockerd instead)

This ensures end users do not need to make any configuration changes
due to the rename from docker to dockerd in version 1.12.

Signed-off-by: Paul Furtado <pfurtado@hubspot.com>
 2016-07-14 17:21:59 -04:00
Charles Smith
ed94129c9e Merge pull request #24640 from avsm/service-create-docs-quoting 
docs: correct the placement constraints `docker service` example
 2016-07-14 13:18:45 -07:00
Charles Smith
fec803f779 update create swarm and add nodes to use the auto-generated join command 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-07-14 11:26:46 -07:00
Tonis Tiigi
0b2023130e Wait for the reader fifo opening to block 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-07-14 10:14:53 -07:00
Sebastiaan van Stijn
56fb100140 Merge pull request #24568 from dmcgowan/search-v2-auth 
Allow v1 search to use v2 auth with identity token
 2016-07-14 19:11:33 +02:00
Anil Madhavapeddy
c37da1792d docs: correct the placement constraints docker service example 
- the constraint expression needs to be quoted
- add an actual redis container to run so the command line works

Signed-off-by: Anil Madhavapeddy <anil@docker.com>
 2016-07-14 17:38:37 +01:00
Antonio Murdaca
0a96ba8a0f Merge pull request #24593 from mlaventure/fix-libcontainerd-data-race 
Fix data race in libcontainerd
 2016-07-14 17:27:24 +02:00
Sebastiaan van Stijn
e056b4e370 Merge pull request #24630 from eskaaren/status_409 
Status code 409 received when conflicting name when creating container
 2016-07-14 15:26:21 +02:00
Eivin Giske Skaaren
5bf46cc436 Status code 409 received when conflicting name when creating container 
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
 2016-07-14 14:58:43 +02:00
Sebastiaan van Stijn
e7e9f753e8 Merge pull request #24628 from vdemeester/service-doc-fixes 
Service doc fixes
 2016-07-14 11:38:07 +02:00
Vincent Demeester
9c5782280c Merge pull request #24588 from justincormack/nonewprivsdoc 
Expand the documentation of "no-new-privileges"
 2016-07-14 11:34:33 +02:00
Vincent Demeester
cc651bc642
Update service inspect --pretty reference docs 
Update the output and fix wrong usage in a tutorial page.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-14 11:23:03 +02:00
Vincent Demeester
dbe310eff0
Update service update commandline reference docs 
Update with the new remove flags

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-14 11:22:18 +02:00
Vincent Demeester
83f232e186 Merge pull request #23773 from dnephin/allow-remove-during-update 
Add remove flags for service update
 2016-07-14 11:10:30 +02:00
Sebastiaan van Stijn
ffd03708e9 Merge pull request #24615 from aaronlehmann/spaces-not-tabs 
Use spaces, not tabs, to format sample "swarm join" command
 2016-07-14 11:07:12 +02:00
Vincent Demeester
accbed33f4 Merge pull request #24607 from dongluochen/serviceInspect 
Fix service inspect --pretty
 2016-07-14 10:51:04 +02:00
Dong Chen
08ae4e544d Fix service inspect --pretty. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-07-14 00:11:29 -07:00
Aaron Lehmann
6de8fcb2f2 Use spaces, not tabs, to format sample "swarm join" command 
Using tabs here seems to cause copy/paste problems in some terminals.
Using spaces is safer.

Fixes #24609

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-07-13 19:31:05 -06:00
Tibor Vass
1c6a8715ab Merge pull request #24592 from thaJeztah/remove-dead-code 
Remove dead code for "inspect --pretty"
 2016-07-13 14:46:42 -07:00