c3bcf238b1
Merge pull request #15836 from rsmitty/issue-15835
...
Resolves link to introduction to Docker
Upstream-commit: 8720f71b522fd0a7abbd47374b27e11d7f1beb7d
Component: engine
2015-08-26 12:06:29 +10:00
8ce1cf104d
Merge pull request #15831 from yasker/master
...
Update plugins.md
Upstream-commit: 3bc375c6e4eb29dde58d966437bd52d146ce55c9
Component: engine
2015-08-26 12:05:35 +10:00
1646aadf41
Merge pull request #15838 from rsmitty/issue-15837
...
Updates link to the understanding-docker section
Upstream-commit: a0f6ff7d58cd3de10f10aea56670f2f3d4e35e70
Component: engine
2015-08-26 11:53:58 +10:00
db9cfc87e1
Updates link to the understanding-docker section
...
Signed-off-by: Spencer Smith <robertspencersmith@gmail.com >
Upstream-commit: 90be489f4030ececf98499d9afaf0bc60becafae
Component: engine
2015-08-25 14:12:29 -07:00
7f42d6bd03
Resolves link to introduction to Docker
...
Signed-off-by: Spencer Smith <robertspencersmith@gmail.com >
Upstream-commit: 9a71dd2b90c13291de979d968b5f9240e9a4a7aa
Component: engine
2015-08-25 13:54:39 -07:00
eea5abee5b
Merge pull request #15821 from vbatts/tarsum_warning
...
tarsum: add a big fat warning
Upstream-commit: bdba406492ad0fab8efb9a74bcd4836c80a9ebe2
Component: engine
2015-08-25 22:53:04 +02:00
c4be78888c
tarsum: add a big fat warning
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 459451de8b6760034dd4bf7a782b7875441254a5
Component: engine
2015-08-25 16:50:08 -04:00
45c63177a1
Windows: Fix docker cp
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f950de575483f562bc56b7f42b67b00b3df1387b
Component: engine
2015-08-25 13:26:49 -07:00
5b4a0b8a4c
cleanup and fix btrfs subvolume recursion deletion
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: bd06432ba32a6cc555de82e08b125992aaec25fb
Component: engine
2015-08-25 13:00:41 -07:00
104b75b203
Update plugins.md
...
Add Convoy to Docker plugin list.
Signed-off-by: Sheng Yang <sheng.yang@rancher.com >
Upstream-commit: 5f156d8c2587018aa16c621a9a48c919465cf3f0
Component: engine
2015-08-25 12:01:31 -07:00
211c5a7ae6
Merge pull request #15824 from Microsoft/10662-moredocs
...
Windows: Minor doc clarification
Upstream-commit: 7dbb5fafcdfa8d83e131a94009907ff0cf7d019e
Component: engine
2015-08-25 13:30:54 -04:00
b6051b4d2b
Fix OpenRC init script
...
The shebang for OpenRC init scripts is now #!/sbin/openrc-run, and we
can also use the default start and stop functions built into OpenRC.
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com >
Upstream-commit: e3772538c0eb5c1478075979d222485cb3bd8c91
Component: engine
2015-08-25 12:02:01 -05:00
ba5891cb58
Drop execute bit from openrc init script
...
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com >
Upstream-commit: 1c0c68b18fe3a32f3e9915c3bf6ae50b69fee288
Component: engine
2015-08-25 12:00:54 -05:00
434547ed08
Merge pull request #14978 from gesellix/websocket-disable-check-origin
...
skip checkOrigin during websocket handshake
Upstream-commit: e134ccada7fae12271c4169e592b8bf09aff923d
Component: engine
2015-08-25 12:56:30 -04:00
77030d2282
Windows: Minor doc clarification
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 759ed647fbdb026ec91ba8ef84e0fac67b1c73bb
Component: engine
2015-08-25 09:36:51 -07:00
67834e90a3
Merge pull request #15818 from calavera/fix_api_json_examples
...
Fix json examples in the api reference.
Upstream-commit: 78698855ce248fb2fc3f23cba26abee073200e80
Component: engine
2015-08-25 09:22:38 -07:00
300f8e6fef
Allow vendoring netns change to build Docker on s390x
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: eecf6cd48cf7c48f00aa8261cf431c87084161ae
Component: engine
2015-08-25 15:07:17 +00:00
5e196ef2cc
Fix json examples in the api reference.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 7296c845b739ae4133e3d02d56cb7e8df29eb020
Component: engine
2015-08-25 10:55:12 -04:00
b498641d47
Merge pull request #14665 from coolljt0725/fix_build_with_resource_limit
...
Fix build with resource limit which system not support.
Upstream-commit: 6f8c4480e4f99b08c84d25f1611d6b12ee646066
Component: engine
2015-08-25 16:42:13 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
3d1664d9d1
Merge pull request #15745 from Microsoft/readme
...
Update readme
Upstream-commit: 02683dfa09f9d9140d2a74d657b28b1e139effa8
Component: engine
2015-08-24 06:13:02 -07:00
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
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
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
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
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
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
