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

25237 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexander Morozov
138f9538f3 Merge pull request #23776 from Microsoft/ShutdownError 
Windows: Prevent logging errors when shutting down an already shut down container
 2016-06-22 12:11:00 -07:00
Tõnis Tiigi
506234e3f0 Merge pull request #23829 from LK4D4/cleanup_unused 
api,daemon: cleanup some unused stuff
 2016-06-22 11:58:57 -07:00
Alexander Morozov
df6630f6a3 Merge pull request #23832 from tonistiigi/unify-swarm-init-update 
Unify swarm init and update options
 2016-06-22 11:56:07 -07:00
Alexander Morozov
7eae48cd21 Merge pull request #23835 from swernli/loggerfix 
Fixing file handle leak for "docker logs"
 2016-06-22 11:52:55 -07:00
Vincent Demeester
b2da02dc7e Merge pull request #23846 from HackToday/fixdoc 
Fix the missing 'ls'
 2016-06-22 11:08:28 +02:00
Kai Qiang Wu(Kennan)
cbd240581f Fix the missing 'ls' 
Signed-off-by: Kai Qiang Wu(Kennan) <wkq5325@gmail.com>
 2016-06-22 08:40:35 +00:00
Sven Dowideit
937c0a1648 Merge pull request #23818 from shishir-a412ed/doc_fix_PR19367 
Man page fix: Mention supported drivers for --storage-opt size option in docker create/run.
 2016-06-22 11:59:10 +10:00
Sven Dowideit
e770b80d80 Merge pull request #23820 from ericbarch/master 
Add missing words in the swarm docs
 2016-06-22 11:58:09 +10:00
Sven Dowideit
4962fea757 Merge pull request #23797 from liubin/fix-typo 
fix some typos
 2016-06-22 11:56:48 +10:00
Sven Dowideit
e76e52b38b Merge pull request #23738 from psiclops/typos 
Fix misspell typos
 2016-06-22 11:56:13 +10:00
Stefan J. Wernli
54f11b84d2 Fixing file handle leak for "docker logs" 
If "docker logs" was used on an offline container, the logger is leaked, leaving it up to the finalizer to close the file handle, which could block removal of the container.  Further, the json file logger could leak an open handle if the logs are read without follow due to an early return without a close.  This change addresses both cases.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
 2016-06-21 18:40:30 -07:00
Tonis Tiigi
0a4a0d9800 Fix opts tests after default port fix 
The code for default port was already there but
it didn’t work because split function errored out
before. This should be the desired behavior that
matches daemon listen address with swarm listen
address.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-21 17:14:55 -07:00
Tonis Tiigi
fb3eb1c27e 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>
 2016-06-21 16:34:32 -07:00
Vincent Demeester
3e0f96cdb3 Merge pull request #23712 from aaronlehmann/parallel-push-multiple-registries 
Fix parallel push of the same image to different registries
 2016-06-22 00:40:35 +02:00
Alexander Morozov
ca669eb849 Merge pull request #23783 from Microsoft/WaitExitDebug 
Windows: Added stateinfo to WaitExit info to aid debugging daemon hangs
 2016-06-21 14:32:31 -07:00
Alexander Morozov
b02e7faa85 Merge pull request #23817 from kencochrane/fix_install_script 
Fixed install script that was not working for RHEL7 host
 2016-06-21 14:20:42 -07:00
Alexander Morozov
ed5d335e22 api,daemon: cleanup some unused stuff 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-06-21 14:15:19 -07:00
Darren Stahl
9aa9bda178 Added stateinfo to WaitExit info to aid debugging daemon hangs 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-06-21 12:41:08 -07:00
Shishir Mahajan
dc3fdfbe5b Man page fix: Mention supported drivers for --storage-opt size option in docker create/run 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2016-06-21 14:53:37 -04:00
Alexander Morozov
7b2b4eb40c Merge pull request #23700 from Microsoft/jjh/fixrotestcases 
Windows: Fix RO test cases
 2016-06-21 09:01:43 -07:00
Eric Barch
db158e9182 Add missing words in the swarm docs 
Signed-off-by: Eric Barch <barch@tomesoftware.com>
 2016-06-21 08:28:59 -07:00
Ken Cochrane
0e84474672
Fixed issue #23787 install script not working for RHEL7 host 
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
 2016-06-21 09:40:00 -04:00
Sven Dowideit
96a58bdba8 Merge pull request #23816 from SvenDowideit/update-docker4-links 
Now that the Docker4 links are online, we can use them
 2016-06-21 23:04:43 +10:00
Sven Dowideit
587d2f9d81 Now that the Docker4 links are online, we can use them 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-06-21 12:55:41 +00:00
Vincent Demeester
96e3f3e2d0 Merge pull request #23757 from AkihiroSuda/overlay2doc 
Add overlay2 description to overlayfs-driver.md
 2016-06-21 14:06:57 +02:00
Sven Dowideit
a6f7167c0a Merge pull request #23805 from albers/completion--cpu-shares--c 
bash completion for `-c` alias to `--cpu-shares`
 2016-06-21 21:19:06 +10:00
Sven Dowideit
5ba6b1e89c Merge pull request #23804 from albers/completion-btrfs-min_space 
bash completion for `docker daemon --storage-opt btrfs.min_space`
 2016-06-21 21:18:49 +10:00
Sven Dowideit
a1eb6528eb Merge pull request #23803 from albers/completion-run--storage-opt 
bash completion for `docker {run,create} --storage-opt`
 2016-06-21 21:18:32 +10:00
Sven Dowideit
38b07e7fa6 Merge pull request #23800 from albers/completion-events-load-save 
bash completion for `load` and `save` image events
 2016-06-21 21:18:16 +10:00
Sven Dowideit
d5939876be Merge pull request #23799 from albers/completion-storage-driver-overlay2 
bash completion for `docker daemon --storage-driver olverlay2`
 2016-06-21 21:18:01 +10:00
Sven Dowideit
a7a0269624 Merge pull request #23798 from albers/completion--link-local-ip 
bash completion for `docker {run,create,network connect} --link-local…
 2016-06-21 21:17:37 +10:00
Sven Dowideit
78d68d6e88 Merge pull request #23794 from sdurrheimer/zsh-completion-daemon-live-restore 
Add zsh completion for 'docker daemon --live-restore'
 2016-06-21 21:17:17 +10:00
Sven Dowideit
d82e82a827 Merge pull request #23657 from neilpeterson/nepeters-docs-configfile 
Added daemon.json Windows example
 2016-06-21 21:07:19 +10:00
Vincent Demeester
f8656a6e37 Merge pull request #23772 from mlaventure/fix-missing-runtime-on-upgrade 
Fix missing container runtime on upgrade
 2016-06-21 12:22:28 +02:00
Vincent Demeester
097d1a2b61 Merge pull request #23780 from shishir-a412ed/doc_update_PR19367 
PR 19367 doc change: Mention supported drivers for --storage-opt size option in docker create/run.
 2016-06-21 12:09:47 +02:00
Vincent Demeester
f3c9ba0bb0 Merge pull request #23781 from kevinjqiu/fix-doc-typo 
Fix some doc typos
 2016-06-21 12:07:00 +02:00
Harald Albers
79296b2770 bash completion for -c alias to --cpu-shares 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-06-21 11:30:26 +02:00
Harald Albers
f693b99870 bash completion for docker daemon --storage-opt btrfs.min_space 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-06-21 11:11:11 +02:00
Harald Albers
7d2ffa00c0 bash completion for docker {run,create} --storage-opt 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-06-21 11:04:09 +02:00
Harald Albers
5334520bf0 bash completion for load and save image events 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-06-21 10:26:21 +02:00
Harald Albers
d96eeff194 bash completion for docker daemon --storage-driver olverlay2 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-06-21 10:19:07 +02:00
Harald Albers
98483f57ed bash completion for docker {run,create,network connect} --link-local-ip 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-06-21 09:43:34 +02:00
Sebastiaan van Stijn
d25cc581f7 Merge pull request #23778 from thaJeztah/sync_api-1.24-1.25 
Sync API changes from 1.25 -> 1.24
 2016-06-21 00:41:17 -07:00
Aaron Lehmann
2753a5e916 Merge pull request #23770 from sfsmithcha/edit_swarm_concept 
clarify swarm concept
 2016-06-21 00:29:49 -07:00
bin liu
950073aabb fix some typos 
Signed-off-by: bin liu <liubin0329@gmail.com>
 2016-06-21 15:29:25 +08:00
Kevin Jing Qiu
3b2ee9a704 Fix some doc typos and spacings 
Signed-off-by: Kevin Jing Qiu <kevin@idempotent.ca>
 2016-06-20 23:54:36 -07:00
Steve Durrheimer
8036fc794a
Add zsh completion for 'docker daemon --live-restore' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-06-21 08:31:28 +02:00
Akihiro Suda
8625adbd67 Add overlay2 description to overlayfs-driver.md 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-06-21 06:18:56 +00:00
Shishir Mahajan
fe6416d04f PR 19367 doc change: Mention supported drivers for --storage-opt size option in docker create/run. 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2016-06-20 22:27:02 -04:00
Darren Stahl
79060e8212 Windows: Prevent logging errors when shutting down an already shut down container 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-06-20 16:57:08 -07:00