675aa5766a
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 >
Upstream-commit: 54f11b84d218c1a7ff4ab4e2148819265da213bc
Component: engine
2016-06-21 18:40:30 -07:00
738f6a0c73
Merge pull request #23712 from aaronlehmann/parallel-push-multiple-registries
...
Fix parallel push of the same image to different registries
Upstream-commit: 3e0f96cdb374caa5e5927bb96ee54a5a2934258c
Component: engine
2016-06-22 00:40:35 +02:00
db2a93d1a1
Merge pull request #23783 from Microsoft/WaitExitDebug
...
Windows: Added stateinfo to WaitExit info to aid debugging daemon hangs
Upstream-commit: ca669eb849da992aa218dfa48a830a0fc0966cbb
Component: engine
2016-06-21 14:32:31 -07:00
af6a729a98
Merge pull request #23817 from kencochrane/fix_install_script
...
Fixed install script that was not working for RHEL7 host
Upstream-commit: b02e7faa85fc8e6e0422a78cb73a7af39ef6eb48
Component: engine
2016-06-21 14:20:42 -07:00
34ef68e15d
Added stateinfo to WaitExit info to aid debugging daemon hangs
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 9aa9bda1780b68946582e36892703fbb4f5f892d
Component: engine
2016-06-21 12:41:08 -07:00
fd4459c7c2
Merge pull request #23700 from Microsoft/jjh/fixrotestcases
...
Windows: Fix RO test cases
Upstream-commit: 7b2b4eb40cfd907f3aa20b630cc2feeb8460404a
Component: engine
2016-06-21 09:01:43 -07:00
0251763747
Fixed issue #23787 install script not working for RHEL7 host
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com >
Upstream-commit: 0e84474672fb30449028b4f7a678d5ab6a81f102
Component: engine
2016-06-21 09:40:00 -04:00
d011d97fca
Merge pull request #23816 from SvenDowideit/update-docker4-links
...
Now that the Docker4 links are online, we can use them
Upstream-commit: 96a58bdba833ebbbe59e47fd9b028766c5d46dfc
Component: engine
2016-06-21 23:04:43 +10:00
d37f26ec66
Now that the Docker4 links are online, we can use them
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 587d2f9d8132c4ba8cfa74e5f0f2ec3328fdf9b9
Component: engine
2016-06-21 12:55:41 +00:00
75f31f238e
Merge pull request #23757 from AkihiroSuda/overlay2doc
...
Add overlay2 description to overlayfs-driver.md
Upstream-commit: 96e3f3e2d040c0b5120efd5bee994b13d44f8087
Component: engine
2016-06-21 14:06:57 +02:00
49342f2690
Merge pull request #23805 from albers/completion--cpu-shares--c
...
bash completion for `-c` alias to `--cpu-shares`
Upstream-commit: a6f7167c0ac4357cab40df9b38532f945bf1a011
Component: engine
2016-06-21 21:19:06 +10:00
1387ff4c20
Merge pull request #23804 from albers/completion-btrfs-min_space
...
bash completion for `docker daemon --storage-opt btrfs.min_space`
Upstream-commit: 5ba6b1e89c61504eafaf4d77b585b0b0e27d204f
Component: engine
2016-06-21 21:18:49 +10:00
c574280c95
Merge pull request #23803 from albers/completion-run--storage-opt
...
bash completion for `docker {run,create} --storage-opt`
Upstream-commit: a1eb6528ebba8bf714e6be4a9405bf80f7ca7725
Component: engine
2016-06-21 21:18:32 +10:00
c24ff25368
Merge pull request #23800 from albers/completion-events-load-save
...
bash completion for `load` and `save` image events
Upstream-commit: 38b07e7fa6acff2dd3fb693ae58a665511b584b8
Component: engine
2016-06-21 21:18:16 +10:00
9ec176f9fe
Merge pull request #23799 from albers/completion-storage-driver-overlay2
...
bash completion for `docker daemon --storage-driver olverlay2`
Upstream-commit: d5939876be4ac6ea518c94f1d62dcadec102e79b
Component: engine
2016-06-21 21:18:01 +10:00
810a3684b9
Merge pull request #23798 from albers/completion--link-local-ip
...
bash completion for `docker {run,create,network connect} --link-local…
Upstream-commit: a7a0269624a2a2ef70031d1c114898c879608073
Component: engine
2016-06-21 21:17:37 +10:00
488cc7291f
Merge pull request #23794 from sdurrheimer/zsh-completion-daemon-live-restore
...
Add zsh completion for 'docker daemon --live-restore'
Upstream-commit: 78d68d6e8889133cc41ec3f34204306c6629f2f6
Component: engine
2016-06-21 21:17:17 +10:00
91c796ca73
Merge pull request #23657 from neilpeterson/nepeters-docs-configfile
...
Added daemon.json Windows example
Upstream-commit: d82e82a827e3292b90156008edfb86912047dd1d
Component: engine
2016-06-21 21:07:19 +10:00
f29a5ef358
Merge pull request #23772 from mlaventure/fix-missing-runtime-on-upgrade
...
Fix missing container runtime on upgrade
Upstream-commit: f8656a6e37ded7d1558b4003c7a527861cd3aef6
Component: engine
2016-06-21 12:22:28 +02:00
d20da36e24
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.
Upstream-commit: 097d1a2b6186dcf1df8ae6135470871aca309a31
Component: engine
2016-06-21 12:09:47 +02:00
2f64d37d3f
Merge pull request #23781 from kevinjqiu/fix-doc-typo
...
Fix some doc typos
Upstream-commit: f3c9ba0bb06597294c51cff1c55512a764eaa2e1
Component: engine
2016-06-21 12:07:00 +02:00
fa97a09588
bash completion for -c alias to --cpu-shares
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 79296b2770b6d629a2e6ab02f888294a99f62153
Component: engine
2016-06-21 11:30:26 +02:00
b53f3f9206
bash completion for docker daemon --storage-opt btrfs.min_space
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: f693b99870031a6f5311defa9aba13b690323594
Component: engine
2016-06-21 11:11:11 +02:00
7e778e4a05
bash completion for docker {run,create} --storage-opt
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 7d2ffa00c08e2f316285fe2f9adf81255f5ae688
Component: engine
2016-06-21 11:04:09 +02:00
09d393de2e
bash completion for load and save image events
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 5334520bf04598121b026c0b5018714fd4120d44
Component: engine
2016-06-21 10:26:21 +02:00
d6fbd5b999
bash completion for docker daemon --storage-driver olverlay2
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d96eeff19416be61e7e021c9dfaed8728a177d02
Component: engine
2016-06-21 10:19:07 +02:00
89b0e5f71b
bash completion for docker {run,create,network connect} --link-local-ip
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 98483f57ed984acd0d1c1f0de85c2b82c0308896
Component: engine
2016-06-21 09:43:34 +02:00
ae46554957
Merge pull request #23778 from thaJeztah/sync_api-1.24-1.25
...
Sync API changes from 1.25 -> 1.24
Upstream-commit: d25cc581f7783a1664394df2506e246c99920ce8
Component: engine
2016-06-21 00:41:17 -07:00
5a4ecb85ca
Merge pull request #23770 from sfsmithcha/edit_swarm_concept
...
clarify swarm concept
Upstream-commit: 2753a5e9169074fd75ba954af2ec57f5ccb9caba
Component: engine
2016-06-21 00:29:49 -07:00
1555ddd988
Fix some doc typos and spacings
...
Signed-off-by: Kevin Jing Qiu <kevin@idempotent.ca >
Upstream-commit: 3b2ee9a704f1e3974dbb9ce857886d5e377580ab
Component: engine
2016-06-20 23:54:36 -07:00
5178237e74
Add zsh completion for 'docker daemon --live-restore'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 8036fc794a54323d28e2179267fd7201eca5b76a
Component: engine
2016-06-21 08:31:28 +02:00
b721dee70b
Add overlay2 description to overlayfs-driver.md
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 8625adbd67f08f2da7816d0ce9d2e9267f7a4f6b
Component: engine
2016-06-21 06:18:56 +00:00
73a81242ef
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 >
Upstream-commit: fe6416d04fb3ccd83fe4fb3a73f0364b88da730a
Component: engine
2016-06-20 22:27:02 -04:00
169d2f0c62
Sync API changes from 1.25 -> 1.24
...
commit 79e1d3877a1b1697028399b8ce39c4ee27b60a96
updated the v1.25 API with changes in SwarmKit,
but these changes should apply to v1.24.
This updates the 1.24 API with the same changes.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 93095b1699eb11e1bd256dcf8f42f34f50ec2c78
Component: engine
2016-06-20 14:07:11 -07:00
acc2e881b3
Temporarily disable API v1.25 docs
...
The docs are currently published from "master" for the RC,
so hiding v1.25 API, which is for docker 1.13
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 59bdd4e56986c09a998f41bfec23a30df14444cc
Component: engine
2016-06-20 13:50:00 -07:00
f5f0a01144
Fix missing container runtime on upgrade
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: d7ceda4e375250e6868854cca96c49a369503745
Component: engine
2016-06-20 11:21:01 -07:00
72d1e6e5de
clarify swarm concept
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: e0296317131782008dcb94c72d591244663d61b1
Component: engine
2016-06-20 11:02:56 -07:00
c9913bf8dc
Windows: Fix RO test cases
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 03816ad5b5a060449243d0e30fa396c2255ddacb
Component: engine
2016-06-20 10:15:20 -07:00
6a59bd46d7
Merge pull request #23011 from coolljt0725/fix_link
...
Fix link doesn't work sometimes when container start with multiple networks
Upstream-commit: 1bbac428de015a24a0724a9d0990d500c445dcad
Component: engine
2016-06-20 09:42:13 -07:00
17b17e3e6c
Merge pull request #23399 from tkopczynski/23211-info-command
...
Migrate info command to cobra
Upstream-commit: e7fd7848688719221853886e9871baa5b09953c1
Component: engine
2016-06-20 09:38:53 -07:00
3f15c5ff29
Merge pull request #23449 from HackToday/improveunit
...
Improve the TestEventsContainerWithMultiNetwork UT
Upstream-commit: 7d7d8fa752d343a084164717d7089cd47f0cacc7
Component: engine
2016-06-20 09:38:22 -07:00
f30933141d
Merge pull request #23649 from dmcgowan/image-delete-last-repo-ref
...
Update rmi logic for canonical references
Upstream-commit: 1475557341b94ef8d8b2ced1bc4fa49b184cd5ff
Component: engine
2016-06-20 09:35:16 -07:00
7768ca41d3
Remove dead code from node update.
...
Also share mode code between update commands
and use flag constants
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: cacaeab9db51f42c33872c6cce1adc3e55f1c9c5
Component: engine
2016-06-20 11:05:48 -04:00
22e8ff931c
Use flag constants for swarm flag.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c08a50dbd1bac8a0bf1c9be5e617273c19a54a2e
Component: engine
2016-06-20 11:04:37 -04:00
c30cfa209c
add more flag constants to service update.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 9d1f3373b3678033c1be197fafc55010cc8531dd
Component: engine
2016-06-20 11:03:36 -04:00
67d1984a09
Merge pull request #23737 from cpuguy83/cleanup_some_service_api_docs
...
Fix a bunch of issues with service API docs
Upstream-commit: e070503511c5cebbb0ee0f1737dcf2f590ce6853
Component: engine
2016-06-20 07:03:37 -07:00
b9bedcbcb2
Fix a bunch of issues with service API docs
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 79e1d3877a1b1697028399b8ce39c4ee27b60a96
Component: engine
2016-06-20 06:40:31 -07:00
b6c8db0026
Merge pull request #23696 from sfsmithcha/check_swarm_cli
...
update docker swarm cli
Upstream-commit: bfff4cce676f12fb092e82b61cc626dfa3944405
Component: engine
2016-06-20 15:40:06 +02:00
4df9b560ec
Merge pull request #23714 from albers/fix-completion-service-swarm-node
...
Fix bash completion for `docker {swarm,node}` subcommands
Upstream-commit: 2bc3efffe29d3a87f3c1f262c39c419d70708d5d
Component: engine
2016-06-20 15:37:08 +02:00
b11273ccd9
Merge pull request #23764 from SvenDowideit/use-rc-advisory
...
Use rc advisory
Upstream-commit: 14a2633f3c8777e0b2d7deed691f122d0b5a8ffd
Component: engine
2016-06-20 21:56:28 +10:00
