Commit Graph

18050 Commits

Author SHA1 Message Date
Sebastiaan van Stijn ee2c476f22 Merge pull request #15804 from epc/epc-2015236
Copy edits for typos
2015-08-25 08:04:53 +02:00
Ed Costello cefb72080d Copy edits for typos
Signed-off-by: Ed Costello <epc@epcostello.com>
2015-08-24 23:02:44 -04:00
Taylor Jones 936b2c6afe adding message option to the import subcommand
Signed-off-by: Taylor Jones <monitorjbl@gmail.com>
2015-08-25 02:55:04 +00:00
Lei Jitang 9a9724ad56 Fix docker daemon restart with paused container.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-08-25 09:42:58 +08:00
Stephen J Day 349aef06d5 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>
2015-08-24 18:08:05 -07:00
Jessie Frazelle 903cd2b9e3 Merge pull request #12159 from mrunalp/feature/ipc_share_dev
ipc: Share /dev/shm and /dev/mqueue when --ipc container:<id/name> is used
2015-08-24 17:55:03 -07:00
Brian Goff 562cc6254f Merge pull request #15702 from LK4D4/fix_events_tests_15
Make events test more deterministic in go1.5
2015-08-24 20:15:09 -04:00
Ma Shimiao dea78fc2ce fix 9939: docker does not remove btrfs subvolumes when destroying container
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-08-24 14:52:07 -07:00
Jessie Frazelle 82e2dec06d Merge pull request #15393 from azurezk/exportImage-toplevel
change exportImage to top-level func
2015-08-24 14:35:55 -07:00
Jessie Frazelle 25f4f5588e Merge pull request #15756 from tonistiigi/15724-remove-nil-contexts
Remove nil contexts
2015-08-24 14:29:48 -07:00
Jessie Frazelle ebe27cb34c Merge pull request #14868 from jeffminard-ck/rhel-init-detect-failure
Allow RHEL init script to detect daemon start pid failure
2015-08-24 14:24:36 -07:00
moxiegirl 0ce37336b3 Merge pull request #15800 from moxiegirl/carry-14503
Closes PR #14503 with this carry
2015-08-24 13:22:19 -07:00
Casey Bisson 831747d59e 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>
2015-08-24 13:21:27 -07:00
Alexander Morozov 1269dd35dc Merge pull request #15728 from tonistiigi/parallel-pulls
Mitigate parallel pull issues
2015-08-24 12:56:21 -07:00
Tonis Tiigi b779bc3102 Mitigate parallel pull issues
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-08-24 11:41:45 -07:00
Alexander Morozov 137df3048c Merge pull request #15389 from aidanhs/aphs-simpler-pull-codepath
Remove unnecessary function parameter, add mirror endpoint test
2015-08-24 11:03:01 -07:00
Alexander Morozov 6b21e98432 Merge pull request #15766 from hqhq/hq_fix_device
Add mode check for device
2015-08-24 10:58:49 -07:00
Brian Goff fd8b25c802 Merge pull request #15348 from tonistiigi/11008-always-unless-stopped-restart-policy
Add always-unless-stopped restart policy
2015-08-24 13:48:56 -04:00
Alexander Morozov 1544c5edb6 Merge pull request #15735 from tonistiigi/graph-register-readcloser
Make graph.Register take in io.Reader
2015-08-24 10:40:04 -07:00
Jessie Frazelle 654b555d09 Merge pull request #15789 from calavera/add_cors_head_option
Allow HEAD requests to container archives via CORS.
2015-08-24 10:27:07 -07:00
Alexander Morozov 386aefb9fc 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>
2015-08-24 09:35:11 -07:00
Brian Goff c0a48a676d Merge pull request #15762 from mattrobenolt/trim
opts/envfile: trim all leading whitespace in a line
2015-08-24 12:32:27 -04:00
Brian Goff e14eaba784 Merge pull request #12918 from thieman/tnt-issue-12595
Use image ID in ps if tag has been updated
2015-08-24 12:24:42 -04:00
Sebastiaan van Stijn 37f58d266f Merge pull request #14564 from docteurklein/master
[experimental compose/swarm] explain how to make it work on awazon ec2.
2015-08-24 17:47:26 +02:00
David Calavera 88cacbf529 Merge pull request #15767 from hqhq/hq_fix_optional_comments
Change all optional unit to [unit]
2015-08-24 17:36:01 +02:00
Sebastiaan van Stijn 32053b965b Merge pull request #15791 from agonzalezro/broken-links-revert
Revert "Fix broken links at plugins documentation"
2015-08-24 15:27:40 +02:00
moxiegirl 02683dfa09 Merge pull request #15745 from Microsoft/readme
Update readme
2015-08-24 06:13:02 -07:00
Brian Goff e4147bcad4 Merge pull request #15776 from duglin/buildEnvTest
Add some builder getEnv tests
2015-08-24 08:57:41 -04:00
Brian Goff 2b174d3d9d Merge pull request #15444 from coolljt0725/add_test_require_for_test_blkio
Add test require for TestRunWithBlkioInvalidWeight and TestRunWithBlkio
2015-08-24 08:33:17 -04:00
Brian Goff 1ee53d4fb7 Merge pull request #15779 from mountkin/split-build-test
split build API tests to a separate file
2015-08-24 08:31:48 -04:00
Álex González 62ce5b6929 Revert "Fix broken links at plugins documentation"
This reverts commit 354147df01.

Signed-off-by: Álex González <agonzalezro@gmail.com>
2015-08-24 11:48:59 +01:00
David Calavera 354a2e105d Allow HEAD requests to container archives via CORS.
Add HEAD to Access-Control-Allow-Methods.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-08-24 05:57:22 -04:00
Qiang Huang 429423624c 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>
2015-08-24 17:57:12 +08:00
David Calavera 888d1d0e20 Merge pull request #15787 from agonzalezro/patch-1
Fix broken links at plugins documentation
2015-08-24 11:49:55 +02:00
Alexandre González 354147df01 Fix broken links at plugins documentation
Signed-off-by: Álex González <agonzalezro@gmail.com>
2015-08-24 10:47:56 +01:00
Qiang Huang c99ed5ae5d 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>
2015-08-24 17:28:19 +08:00
David Calavera 9bac520c12 Merge pull request #15571 from ewindisch/apparmor_denywproc
AppArmor: Deny w to /proc/* files
2015-08-24 11:03:41 +02:00
David Calavera cb00396f61 Merge pull request #15332 from pugnascotia/master
Make run and rmi bash completions configurable
2015-08-24 10:49:01 +02:00
Lei Jitang c340ca4f5d Add some missing cgroup test require and refactor the require check.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-08-24 11:37:11 +08:00
Travis Thieman 2167f40a76 Use image ID if tag has been updated
Fixes #12595

Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
2015-08-23 12:11:24 -04:00
Shijiang Wei 96e37f671a split build API tests to a separate file
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-08-23 23:59:15 +08:00
Sebastiaan van Stijn 7ead74d903 Merge pull request #15774 from charleswhchan/patch-4
Revise Mac Docker instructions
2015-08-23 10:26:58 +02:00
Sven Dowideit 819166c16c Merge pull request #15769 from charleswhchan/patch-1
Revise Windows Docker instructions
2015-08-23 12:11:37 +10:00
Doug Davis eeeae2c235 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>
2015-08-22 13:12:43 -07:00
Matt Robenolt f1988f046f opts/envfile: trim all leading whitespace in a line
Signed-off-by: Matt Robenolt <matt@ydekproductions.com>
2015-08-22 09:01:27 -07:00
Charles Chan 9572edc34a Revise Mac Docker instructions
* Clarify `default` VM
* Various minor changes

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-08-22 08:00:48 -07:00
Charles Chan 3faba5fbe2 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>
2015-08-22 07:26:26 -07:00
Sebastiaan van Stijn efabc8ee1a Merge pull request #15764 from coolljt0725/docs_update_readme_in_daemon
Docs: remove networkdriver from README.md in daemon
2015-08-22 13:36:38 +02:00
Qiang Huang 76a5fdc3d4 Change all optional unit to [unit]
As suggested before, we should change every signal one.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-08-21 21:29:52 -07:00
Tianon Gravi 5fd15da7da Merge pull request #15763 from tianon/dind-tmp
Update dind "/tmp" mounting to be optional
2015-08-21 21:14:35 -07:00