Commit graph

17873 commits

Author SHA1 Message Date
Alexander Morozov
6b21e98432 Merge pull request from hqhq/hq_fix_device
Add mode check for device
2015-08-24 10:58:49 -07:00
Brian Goff
fd8b25c802 Merge pull request 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 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 from calavera/add_cors_head_option
Allow HEAD requests to container archives via CORS.
2015-08-24 10:27:07 -07:00
Brian Goff
c0a48a676d Merge pull request 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 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 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 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 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 from Microsoft/readme
Update readme
2015-08-24 06:13:02 -07:00
Brian Goff
e4147bcad4 Merge pull request from duglin/buildEnvTest
Add some builder getEnv tests
2015-08-24 08:57:41 -04:00
Brian Goff
2b174d3d9d Merge pull request 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 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 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 from ewindisch/apparmor_denywproc
AppArmor: Deny w to /proc/* files
2015-08-24 11:03:41 +02:00
David Calavera
cb00396f61 Merge pull request 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 

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 from charleswhchan/patch-4
Revise Mac Docker instructions
2015-08-23 10:26:58 +02:00
Sven Dowideit
819166c16c Merge pull request 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  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 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 from tianon/dind-tmp
Update dind "/tmp" mounting to be optional
2015-08-21 21:14:35 -07:00
Lei Jitang
ce5bbed858 Docs: remove networkdriver from README.md in daemon
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-08-22 10:09:07 +08:00
Brian Goff
5929502b4e Merge pull request from vdemeester/dont-sleep-too-much
time.Sleep in integration tests — comment and waitRun/waitInspect
2015-08-21 20:43:55 -04:00
Jessie Frazelle
90801ab939 Merge pull request from Microsoft/sjw/graphdriver_missing_parent
Windows: Graphdriver should reject create of layer w/o parent
2015-08-21 16:34:03 -07:00
Jessie Frazelle
fefc9a3a6a Merge pull request from mountkin/fix-exec-panic
fix a panic when the exec fails to start
2015-08-21 15:54:58 -07:00
Tianon Gravi
b8bed8832b Update dind "/tmp" mounting to be optional
This allows someone running the image to use `-v` to mount a non-tmpfs `/tmp` into their image if they so require/desire.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-08-21 15:47:50 -07:00
Jessie Frazelle
c5733e6a20 Merge pull request from rvesse/sysvinit-redhat-silent-fail
Fix silent failure in RedHat sysvinit script
2015-08-21 14:54:25 -07:00
Jessie Frazelle
e5e6eaacee Merge pull request from vbatts/update-tar-split
vendor: update tar-split to v0.9.6
2015-08-21 14:45:19 -07:00
Sebastiaan van Stijn
9415db7e95 Merge pull request from Microsoft/addazure
Add Microsoft Azure
2015-08-21 23:41:36 +02:00
Jessie Frazelle
9bd8a9b66b Merge pull request from hqhq/hq_add_kmem_limit
Add support for kernel memory limit
2015-08-21 14:34:27 -07:00
Jessie Frazelle
ecff4badcd Merge pull request from WeiZhang555/golint-stdcopy-system
fix golint warnings/errors on pkg/system and pkg/stdcopy
2015-08-21 14:27:59 -07:00
Jessie Frazelle
008a8ffdd2 Merge pull request from calavera/gender_unbiased_names
Add more amazing women to the names generator.
2015-08-21 14:24:49 -07:00
Jessie Frazelle
19f7bfcda9 Merge pull request from clintonskitson/patch_issue_15467
added check for bind on create to determine local volume driver
2015-08-21 14:23:44 -07:00
Jessie Frazelle
9b8cfb6c79 Merge pull request from Mashimiao/state-separate-part-of-SetRestarting
daemon/state: separate part of SetRestarting to setRestarting
2015-08-21 14:21:10 -07:00
Jessie Frazelle
9d22c7a2d5 Merge pull request from jfrazelle/hack-dind-its-been-fun
docker 1.8+ no longer needs dind
2015-08-21 13:51:41 -07:00
Jessie Frazelle
616950b030 Merge pull request from coolljt0725/add_blk_dev_throttling_to_check_config
Add CONFIG_BLK_DEV_THROTTLING to check-config.sh
2015-08-21 13:48:28 -07:00
Stefan J. Wernli
a456f20b44 Windows: Graphdriver should reject create of layer w/o parent
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2015-08-21 13:23:04 -07:00
Jessie Frazelle
e6be51a0f9 Merge pull request from jfrazelle/EOL-fedora-20
fedora 20 is EOL remove from rpm builder
2015-08-21 13:15:58 -07:00