Sebastiaan van Stijn
26c8e31eba
Merge pull request #15804 from epc/epc-2015236
...
Copy edits for typos
Upstream-commit: ee2c476f22a7727815c91a356190fcb3e23c9d6c
Component: engine
2015-08-25 08:04:53 +02:00
Ed Costello
cb83c53d63
Copy edits for typos
...
Signed-off-by: Ed Costello <epc@epcostello.com >
Upstream-commit: cefb72080d8d30a2f53ac6c7ae91d58e42210661
Component: engine
2015-08-24 23:02:44 -04:00
Taylor Jones
15378abfc2
adding message option to the import subcommand
...
Signed-off-by: Taylor Jones <monitorjbl@gmail.com >
Upstream-commit: 936b2c6afe490b562df4ebea854b116c3b40a9f5
Component: engine
2015-08-25 02:55:04 +00:00
Lei Jitang
ef9b8937c0
Fix docker daemon restart with paused container.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 9a9724ad5616dc1a29efabe8082bde043c1a2bc9
Component: engine
2015-08-25 09:42:58 +08:00
Stephen J Day
78b5767538
Avoid buffering to tempfile when pushing with V2
...
The practice of buffering to a tempfile during a pushing contributes massively
to slow V2 push performance perception. The protocol was actually designed to
avoid precalculation, supporting cut-through data push. This means we can
assemble the layer, calculate its digest and push to the remote endpoint, all
at the same time.
This should increase performance massively on systems with slow disks or IO
bottlenecks.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 349aef06d51a9425f70a877585fe45283366c2c4
Component: engine
2015-08-24 18:08:05 -07:00
Jessie Frazelle
322a07231d
Merge pull request #12159 from mrunalp/feature/ipc_share_dev
...
ipc: Share /dev/shm and /dev/mqueue when --ipc container:<id/name> is used
Upstream-commit: 903cd2b9e3e2cea8b5ee7c0b74d52ff4a3beafb5
Component: engine
2015-08-24 17:55:03 -07:00
Brian Goff
02b562a357
Merge pull request #15702 from LK4D4/fix_events_tests_15
...
Make events test more deterministic in go1.5
Upstream-commit: 562cc6254fbeae24be2cc7ab5b4a608bcb06ac5f
Component: engine
2015-08-24 20:15:09 -04:00
Ma Shimiao and Jessica Frazelle
488804ae00
fix 9939: docker does not remove btrfs subvolumes when destroying container
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: dea78fc2ce9d7a2cf24b79f8625a06dbd74403a2
Component: engine
2015-08-24 14:52:07 -07:00
Jessie Frazelle
69dbe5953f
Merge pull request #15393 from azurezk/exportImage-toplevel
...
change exportImage to top-level func
Upstream-commit: 82e2dec06de63d85db14c954e472deffdd18c5b7
Component: engine
2015-08-24 14:35:55 -07:00
Jessie Frazelle
a45c2b3952
Merge pull request #15756 from tonistiigi/15724-remove-nil-contexts
...
Remove nil contexts
Upstream-commit: 25f4f5588e1b862f1f26a2e4edb57807a9affda4
Component: engine
2015-08-24 14:29:48 -07:00
Jessie Frazelle
2bf0729522
Merge pull request #14868 from jeffminard-ck/rhel-init-detect-failure
...
Allow RHEL init script to detect daemon start pid failure
Upstream-commit: ebe27cb34ca5e91173b004e2602c99704350eb7c
Component: engine
2015-08-24 14:24:36 -07:00
moxiegirl
6d01b67691
Merge pull request #15800 from moxiegirl/carry-14503
...
Closes PR #14503 with this carry
Upstream-commit: 0ce37336b308f0821f7fae1329abd8a569ad798f
Component: engine
2015-08-24 13:22:19 -07:00
Casey Bisson and Mary Anthony
1b86d576e7
Closes PR #14503 with this carry
...
- Refer to Joyent's blogs and docs rather than following from our end
- All of this information exists on Joyent's site
Updating with thaJeztah's comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 831747d59ed45893a0c1947ad369c7e516ec54e8
Component: engine
2015-08-24 13:21:27 -07:00
Alexander Morozov
f491318c6b
Merge pull request #15728 from tonistiigi/parallel-pulls
...
Mitigate parallel pull issues
Upstream-commit: 1269dd35dcd4c2d28f64c801e5410e172881b9fe
Component: engine
2015-08-24 12:56:21 -07:00
Tonis Tiigi
32eed5b907
Mitigate parallel pull issues
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: b779bc31022fddd165ac7d919cb06d78288a93c9
Component: engine
2015-08-24 11:41:45 -07:00
Alexander Morozov
b8a7d29c01
Merge pull request #15389 from aidanhs/aphs-simpler-pull-codepath
...
Remove unnecessary function parameter, add mirror endpoint test
Upstream-commit: 137df3048c4aac0e5e22118f8e9f2c46717b9f64
Component: engine
2015-08-24 11:03:01 -07:00
Alexander Morozov
a5560b01cb
Merge pull request #15766 from hqhq/hq_fix_device
...
Add mode check for device
Upstream-commit: 6b21e98432ef3c4c9b7da42cdb94749b9181b654
Component: engine
2015-08-24 10:58:49 -07:00
Brian Goff
83ec490c79
Merge pull request #15348 from tonistiigi/11008-always-unless-stopped-restart-policy
...
Add always-unless-stopped restart policy
Upstream-commit: fd8b25c802780683cc5776e6d3aaca9536e7370b
Component: engine
2015-08-24 13:48:56 -04:00
Alexander Morozov
84c411f6f2
Merge pull request #15735 from tonistiigi/graph-register-readcloser
...
Make graph.Register take in io.Reader
Upstream-commit: 1544c5edb6fc796918a0bc2968a48df4e23a9fdb
Component: engine
2015-08-24 10:40:04 -07:00
Jessie Frazelle
96d6f2f16e
Merge pull request #15789 from calavera/add_cors_head_option
...
Allow HEAD requests to container archives via CORS.
Upstream-commit: 654b555d09f7f541f3bca8bbbaab199b736bf111
Component: engine
2015-08-24 10:27:07 -07:00
Alexander Morozov
c6a7b3f411
Make events test more deterministic in go1.5
...
Now scheduler makes order of events pretty random, so I added little
sleeps to make order intact. Also I renamed to test so name better
describes its nature.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 386aefb9fcf65f1a5f68fd61e5108ea0858d2d3f
Component: engine
2015-08-24 09:35:11 -07:00
Brian Goff
5b49726f6a
Merge pull request #15762 from mattrobenolt/trim
...
opts/envfile: trim all leading whitespace in a line
Upstream-commit: c0a48a676d34e976f0146c2c4d5e468d8824059d
Component: engine
2015-08-24 12:32:27 -04:00
Brian Goff
3170babd78
Merge pull request #12918 from thieman/tnt-issue-12595
...
Use image ID in ps if tag has been updated
Upstream-commit: e14eaba784c3c78a964c5e50e8fa113d3321bbf8
Component: engine
2015-08-24 12:24:42 -04:00
Sebastiaan van Stijn
89ff54bbdb
Merge pull request #14564 from docteurklein/master
...
[experimental compose/swarm] explain how to make it work on awazon ec2.
Upstream-commit: 37f58d266fdc2b840713d152639a12aea33b2081
Component: engine
2015-08-24 17:47:26 +02:00
David Calavera
78780b4f3f
Merge pull request #15767 from hqhq/hq_fix_optional_comments
...
Change all optional unit to [unit]
Upstream-commit: 88cacbf529155f3d7b74d923d4c275726b47599f
Component: engine
2015-08-24 17:36:01 +02:00
Sebastiaan van Stijn
4f84784ef4
Merge pull request #15791 from agonzalezro/broken-links-revert
...
Revert "Fix broken links at plugins documentation"
Upstream-commit: 32053b965b14837c170a02096efa6526d756a8bd
Component: engine
2015-08-24 15:27:40 +02:00
moxiegirl
3d1664d9d1
Merge pull request #15745 from Microsoft/readme
...
Update readme
Upstream-commit: 02683dfa09f9d9140d2a74d657b28b1e139effa8
Component: engine
2015-08-24 06:13:02 -07:00
Brian Goff
f47a2e25df
Merge pull request #15776 from duglin/buildEnvTest
...
Add some builder getEnv tests
Upstream-commit: e4147bcad49fe69ba75cc197c5bcb3554f22d314
Component: engine
2015-08-24 08:57:41 -04:00
Brian Goff
d98907dbfe
Merge pull request #15444 from coolljt0725/add_test_require_for_test_blkio
...
Add test require for TestRunWithBlkioInvalidWeight and TestRunWithBlkio
Upstream-commit: 2b174d3d9d6f6308a8092c93ff74461f2a946fee
Component: engine
2015-08-24 08:33:17 -04:00
Brian Goff
1338c02038
Merge pull request #15779 from mountkin/split-build-test
...
split build API tests to a separate file
Upstream-commit: 1ee53d4fb724c78a44c66d572db63608ba7733f8
Component: engine
2015-08-24 08:31:48 -04:00
Álex González
e747a5b96c
Revert "Fix broken links at plugins documentation"
...
This reverts commit 354147df012dd35f82e59e3511d9be4fc7610352.
Signed-off-by: Álex González <agonzalezro@gmail.com >
Upstream-commit: 62ce5b69294da90bd48caed1beb198264f246a4f
Component: engine
2015-08-24 11:48:59 +01:00
David Calavera
e7fb39d7af
Allow HEAD requests to container archives via CORS.
...
Add HEAD to Access-Control-Allow-Methods.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 354a2e105d26a310501891e6c097eacfd037d8c6
Component: engine
2015-08-24 05:57:22 -04:00
Qiang Huang
fdb06e387e
Add mode check for device
...
This fixes two problems:
1. docker run --device /dev/sda:rw ubuntu bash doesn't work
2. --device /dev/zero:/dev/noro:ro doesn't show clear error message,
but fail when writing to cgroup file.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 429423624c61b38efeaeda95792077a0da65c4ef
Component: engine
2015-08-24 17:57:12 +08:00
David Calavera
11cc09587a
Merge pull request #15787 from agonzalezro/patch-1
...
Fix broken links at plugins documentation
Upstream-commit: 888d1d0e20700e288ec43518c5faeedef959ddb7
Component: engine
2015-08-24 11:49:55 +02:00
Alexandre González
c9a9289a5b
Fix broken links at plugins documentation
...
Signed-off-by: Álex González <agonzalezro@gmail.com >
Upstream-commit: 354147df012dd35f82e59e3511d9be4fc7610352
Component: engine
2015-08-24 10:47:56 +01:00
Qiang Huang
a8c00ae391
Change return value for ValidateMountMode
...
1. rename it from ValidateMountMode to ValidMountMode
Because it's a function simply check mount mode is valid or not.
2. remove the rw check return value
It's not supposed to be combined into this function, and we already
have a function for that check.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: c99ed5ae5d0a9167ead73a798b02600ad40651f2
Component: engine
2015-08-24 17:28:19 +08:00
David Calavera
7143030753
Merge pull request #15571 from ewindisch/apparmor_denywproc
...
AppArmor: Deny w to /proc/* files
Upstream-commit: 9bac520c129c9fd5c9415b5170a66567d85247b4
Component: engine
2015-08-24 11:03:41 +02:00
David Calavera
9f8e87311a
Merge pull request #15332 from pugnascotia/master
...
Make run and rmi bash completions configurable
Upstream-commit: cb00396f61d0960af712094bac8711ca309b1aec
Component: engine
2015-08-24 10:49:01 +02:00
Lei Jitang
bfcda62bd6
Add some missing cgroup test require and refactor the require check.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: c340ca4f5db9ab526532f26718a140654ff45458
Component: engine
2015-08-24 11:37:11 +08:00
Travis Thieman
dd5279c777
Use image ID if tag has been updated
...
Fixes #12595
Signed-off-by: Travis Thieman <travis.thieman@gmail.com >
Upstream-commit: 2167f40a766d1909443695d96bcecc3d039fb482
Component: engine
2015-08-23 12:11:24 -04:00
Shijiang Wei
2633e7b138
split build API tests to a separate file
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 96e37f671abd86f0a38403d2184e73ac6e56afd0
Component: engine
2015-08-23 23:59:15 +08:00
Sebastiaan van Stijn
a4109bfd5c
Merge pull request #15774 from charleswhchan/patch-4
...
Revise Mac Docker instructions
Upstream-commit: 7ead74d903de625eef9dc0ec83ba5bcedd0bc0dc
Component: engine
2015-08-23 10:26:58 +02:00
Sven Dowideit
7652408d2c
Merge pull request #15769 from charleswhchan/patch-1
...
Revise Windows Docker instructions
Upstream-commit: 819166c16cfa5911751501e2e0c99cf7b8e6e732
Component: engine
2015-08-23 12:11:37 +10:00
Doug Davis
49eee7cf68
Add some builder getEnv tests
...
In particular I want to make sure that calling getEnv() when the same
var name appears more than once in the env list that we only pick up
the first one. PR #15182 counts on this
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: eeeae2c235f0f075284008cced669de177dd8747
Component: engine
2015-08-22 13:12:43 -07:00
Matt Robenolt
bf4ef3faec
opts/envfile: trim all leading whitespace in a line
...
Signed-off-by: Matt Robenolt <matt@ydekproductions.com >
Upstream-commit: f1988f046f680c268e39d7b3f11374fe93c22365
Component: engine
2015-08-22 09:01:27 -07:00
Charles Chan
39b3c96373
Revise Mac Docker instructions
...
* Clarify `default` VM
* Various minor changes
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: 9572edc34a65736415050f02df3822edeaa55dbc
Component: engine
2015-08-22 08:00:48 -07:00
Charles Chan
7f28a26384
Revise Windows Docker instructions
...
* Fix Windows 7 (not 7.1 ;p)
* Clarify virtualization technology section, add link to wiki
* Fix heading level for various ways of starting Docker container
* Clarify `default` VM
* Various minor changes
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: 3faba5fbe264425ac6d15bdfdf3c5a72e25643cb
Component: engine
2015-08-22 07:26:26 -07:00
Vincent Demeester
ae7a8a8203
Fix filter by label for docker images
...
Using Config.Labels to filter images on Labels.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: c71a99af11c1ae5442b7787368fd27ac2799ef99
Component: engine
2015-08-22 14:06:48 +02:00
Sebastiaan van Stijn
661743fa45
Merge pull request #15764 from coolljt0725/docs_update_readme_in_daemon
...
Docs: remove networkdriver from README.md in daemon
Upstream-commit: efabc8ee1a691ec9ed643236ef664c9965be80de
Component: engine
2015-08-22 13:36:38 +02:00
Qiang Huang
8d277bea0f
Change all optional unit to [unit]
...
As suggested before, we should change every signal one.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 76a5fdc3d429030bcfdce1a52a17383c2bf2f71b
Component: engine
2015-08-21 21:29:52 -07:00