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

25881 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Demeester
81ef36c980 Merge pull request #24820 from sfsmithcha/add_how_swarm_works_guide 
add how nodes work to how swarm works guide
 2016-07-20 22:08:31 +02:00
Brian Goff
053a4b844a Merge pull request #24859 from albers/completion-syslog-driver-options 
Update completions for syslog log driver options
 2016-07-20 15:47:48 -04:00
Brian Goff
eddb3a2020 Merge pull request #24024 from AkihiroSuda/buildcache2 
mount .go-pkg-cache for DOCKER_INCREMENTAL_BINARY
 2016-07-20 15:37:39 -04:00
Charles Smith
137261f97c add how nodes work to how swarm works guide 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-07-20 12:37:38 -07:00
Harald Albers
492fdf1f57 Update completions for syslog log driver options 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-07-20 12:35:04 -07:00
Sebastiaan van Stijn
7d84c71500 Merge pull request #24620 from yongtang/24270-service-list-filter 
Allow partial name match for service ls --filter, node ls --filter, node tasks --filter
 2016-07-20 21:25:06 +02:00
Sebastiaan van Stijn
a9ca19feaa Merge pull request #24523 from sfsmithcha/clarify_rolling_update 
clarify update-delay and rolling update behavior
 2016-07-20 20:24:18 +02:00
Sebastiaan van Stijn
9fc384cb0b Merge pull request #24852 from thaJeztah/add-stack-services-reference 
docs: add initial reference for "stack services"
 2016-07-20 20:15:52 +02:00
Charles Smith
68a9224bd4 clarify update-delay and rolling update behavior 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-07-20 10:11:04 -07:00
Sebastiaan van Stijn
f49dc528ed
docs: add initial reference for "stack services" 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-20 18:56:49 +02:00
Sebastiaan van Stijn
2a78789ad1 Merge pull request #24266 from allencloud/add_cmd_docker_stack_services_STACKNAME 
add command `docker stack services STACKNAME`
 2016-07-20 18:38:08 +02:00
Arnaud Porterie
b9c4959882 Merge pull request #24841 from thaJeztah/rename-bundle-flag 
[RFC] Rename --bundle to --file
 2016-07-20 15:50:54 +00:00
Yong Tang
467107cd40 Vendor swarmkit to 9ee5fc3b8db5de8c8593a57bc45fc178f74ceee1 
This commit update swarmkit to 9ee5fc3b8db5de8c8593a57bc45fc178f74ceee1.

This is part of step to fix #24270.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-07-20 08:16:54 -07:00
Yong Tang
e734fa58ea Allow partial name match for node ls, and node tasks 
This fix is an extension to last commit to expand the partial
filter to node and task searches.

Additional integration tests have been added to cover the changes.

This fix fixes 24270.
This fix fixes 24112.

Note: A separate pull request will be opened on swarmkit.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-07-20 08:16:10 -07:00
Sebastiaan van Stijn
d6d02f652c Merge pull request #24843 from resouer/fix-nits 
Fix nits in deprecated
 2016-07-20 16:32:47 +02:00
Sebastiaan van Stijn
eb897f490e Merge pull request #24839 from thaJeztah/fix-duplicated-usage 
fix duplicated usage in docs
 2016-07-20 16:07:35 +02:00
Sebastiaan van Stijn
06f35262c4
Rename --bundle to --file 
This renames the '--bundle' flag for docker (stack) deploy
to be consistent with 'docker build'.

Note that there's no shorthand '-f' added for now,
because this may be confusing on 'docker stack config',
which also takes a file, and for which we may want to
have a '--format' flag in future.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-20 16:03:27 +02:00
Sebastiaan van Stijn
effbd2b76d
fix duplicated usage in docs 
this removes a copy/pasta whoopsie on my side,
introduced in de64324109

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-20 15:36:02 +02:00
Doug Davis
3d4bde92b7 Merge pull request #24832 from npcode/fix-service-rm-usage 
Fix the usage for `service rm` command
 2016-07-20 06:44:34 -04:00
Vincent Demeester
5527763f8c Merge pull request #24828 from sdurrheimer/zsh-completion-node-update-label-add-rm 
Add zsh completion for 'docker node update --label-{add,rm}'
 2016-07-20 11:47:03 +02:00
Vincent Demeester
22c42fc26a Merge pull request #24829 from sdurrheimer/zsh-completion-service-create-update-log-driver-opt 
Add zsh completion for 'docker service {create,update} --log-{driver,opt}'
 2016-07-20 11:46:56 +02:00
Yi EungJun
cf61cd3a92 Fix the usage for service rm command 
Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
 2016-07-20 18:27:26 +09:00
Akihiro Suda
389d5cde7b mount .go-pkg-cache for DOCKER_INCREMENTAL_BINARY 
The cache was not used when we run `make binary` from the host.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-07-20 08:20:38 +00:00
Steve Durrheimer
45484f5458
Add zsh completion for 'docker service {create,update} --log-{driver,opt}' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-07-20 09:18:59 +02:00
Steve Durrheimer
cdb8383d7f
Add zsh completion for 'docker node update --label-{add,rm}' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-07-20 09:11:16 +02:00
Sebastiaan van Stijn
724c69f060 Merge pull request #24507 from sfsmithcha/doc_node_labels 
add ref docs for node label
 2016-07-20 00:46:51 +02:00
Charles Smith
9594ac97ce add ref docs for node label 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-07-19 15:41:00 -07:00
Brian Goff
a9b392014f Merge pull request #24653 from dongluochen/testrollingupdate 
Add integration test for rolling update
 2016-07-19 16:51:40 -04:00
Vincent Demeester
f2afd1a906 Merge pull request #24049 from tophj-ibm/remove-lingering-volume-from-tests 
DockerExternalVolumeSuite: add daemon to test
 2016-07-19 22:39:39 +02:00
Dong Chen
d327765a62 Test rolling update. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-07-19 12:09:30 -07:00
Sebastiaan van Stijn
4498214a2a Merge pull request #24801 from anusha-ragunathan/plugin-lookup 
Remove extra map lookup for volume drivers.
 2016-07-19 20:52:39 +02:00
Brian Goff
2ee828aac2 Merge pull request #24802 from vdemeester/stack-docs-and-flags 
Add documentation for stack commands
 2016-07-19 14:30:49 -04:00
Arnaud Porterie
ffba13f435 Merge pull request #24648 from mlaventure/fix-kill-test 
Fix TestDaemonRestartWithKilledRunningContainer failures on RHEL systems
 2016-07-19 18:24:34 +00:00
Arnaud Porterie
ac26ee15df Merge pull request #23825 from dnephin/auto-gen-man-page 
Generate man pages from the Command description
 2016-07-19 18:22:01 +00:00
Tibor Vass
39327a67e8 Merge pull request #24804 from crosbymichael/rpm-socket 
Remove docker.socket from rpm based systems
 2016-07-19 11:18:22 -07:00
Anusha Ragunathan
5d4627331e Remove extra map lookup for volume drivers. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-07-19 09:35:56 -07:00
Vincent Demeester
10919e8909
Add documentation for stack commands 
Also removes the `-f` flags of bundle to follow the single-letter flags
evaluation.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-19 18:32:44 +02:00
Michael Crosby
04104c3a1e Remove docker.socket from rpm based systems 
Fixes #23981

The selinux issue we are seeing in the report is related to the socket
file for docker and nothing else. By removing the socket docker starts
up correctly.

However, there is another motivation for removing socket activation from
docker's systemd files and that is because when you have daemons running
with --restart always whenever you have a host reboot those daemons
will not be started again because the docker daemon is not started by
systemd until a request comes into the docker API.

Leave it for deb based systems because everything is working correctly
for both socket activation and starting normally at boot.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-07-19 09:31:43 -07:00
Daniel Nephin
47cca88c8c Dont run man generation as part of test-unit. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-19 12:00:35 -04:00
Daniel Nephin
25e9b06ac0 Set Long text for volume commands so they can be used to generate man pages. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-19 12:00:21 -04:00
Daniel Nephin
00a8a40398 Add a script to generate man pages from cobra commands. 
Use the generate.sh script instead of md2man directly.
Update Dockerfile for generating man pages.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-19 12:00:21 -04:00
Kenfe-Mickael Laventure
c02f82756e Update libcontainerd.AddProcess to accept a context 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-07-19 08:24:39 -07:00
Kenfe-Mickael Laventure
64483c3bda Do not rely on "live" event anymore 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-07-19 08:24:39 -07:00
Vincent Demeester
6875f71d7c Merge pull request #24776 from anusha-ragunathan/plugins-connect 
Add only legacy plugins to the legacy lookup map.
 2016-07-19 17:11:50 +02:00
Daniel Nephin
68e52febde Merge pull request #24722 from thaJeztah/update-usage-for-deprecated-flags 
Don't automagically add "[OPTIONS]" to usage
 2016-07-19 11:01:33 -04:00
Harry Zhang
78a5480dfd Fix nits in deprecated 
Signed-off-by: Harry Zhang <harryz@hyper.sh>
 2016-07-19 22:42:23 +08:00
Sebastiaan van Stijn
be2e2fca08 Merge pull request #24791 from albers/completion-node-update-labels 
bash completion for `docker node update --label-{add,rm}`
 2016-07-19 15:22:29 +02:00
Sebastiaan van Stijn
ebca26b4b1 Merge pull request #24792 from albers/completion-service-log-drivers 
bash completion for `docker service {create,update} --log-{driver,opt}`
 2016-07-19 15:19:55 +02:00
Phil Estes
8a766b859f Merge pull request #24741 from dsau/24704-create-zfs-directory 
Create zfs directory if it doesn't exist at startup.
 2016-07-19 13:22:54 +01:00
Harald Albers
823e161de7 bash completion for docker service {create,update} --log-{driver,opt} 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-07-19 13:20:40 +02:00