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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
c6342a854c
Merge pull request #15763 from tianon/dind-tmp
...
Update dind "/tmp" mounting to be optional
Upstream-commit: 5fd15da7daad56c07842ecda082e9c5d0e6ff620
Component: engine
2015-08-21 21:14:35 -07:00
5221811ef0
Docs: remove networkdriver from README.md in daemon
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: ce5bbed8582227482f7afa1c647d52eab9fb2de3
Component: engine
2015-08-22 10:09:07 +08:00
e2e0f70ccb
Merge pull request #15412 from vdemeester/dont-sleep-too-much
...
time.Sleep in integration tests — comment and waitRun/waitInspect
Upstream-commit: 5929502b4e05ed82e78347169f3ba705cac8ad35
Component: engine
2015-08-21 20:43:55 -04:00
427f147704
Merge pull request #15708 from Microsoft/sjw/graphdriver_missing_parent
...
Windows: Graphdriver should reject create of layer w/o parent
Upstream-commit: 90801ab9398d80576003d31255dd08613393b741
Component: engine
2015-08-21 16:34:03 -07:00
a372501fd6
Merge pull request #15750 from mountkin/fix-exec-panic
...
fix a panic when the exec fails to start
Upstream-commit: fefc9a3a6ae9ccb738a4e984ff90db70bb053484
Component: engine
2015-08-21 15:54:58 -07:00
590a40fb3c
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 >
Upstream-commit: b8bed8832b77a478360ae946a69dab5e922b194e
Component: engine
2015-08-21 15:47:50 -07:00
fbe61adda8
Merge pull request #15366 from rvesse/sysvinit-redhat-silent-fail
...
Fix silent failure in RedHat sysvinit script
Upstream-commit: c5733e6a20a7a8e3a777defb1b1cd5c4e9b52d9c
Component: engine
2015-08-21 14:54:25 -07:00
ec7a94a85c
Merge pull request #15492 from vbatts/update-tar-split
...
vendor: update tar-split to v0.9.6
Upstream-commit: e5e6eaacee75933c074e02aa2663c69a30e51027
Component: engine
2015-08-21 14:45:19 -07:00
4416c4b68a
Merge pull request #15742 from Microsoft/addazure
...
Add Microsoft Azure
Upstream-commit: 9415db7e95858683ec94265c4a8108ad399867dd
Component: engine
2015-08-21 23:41:36 +02:00
26bf545a48
Merge pull request #14006 from hqhq/hq_add_kmem_limit
...
Add support for kernel memory limit
Upstream-commit: 9bd8a9b66bb493026599d22c7637909cb460d039
Component: engine
2015-08-21 14:34:27 -07:00
ad05d1ea8d
Merge pull request #15125 from WeiZhang555/golint-stdcopy-system
...
fix golint warnings/errors on pkg/system and pkg/stdcopy
Upstream-commit: ecff4badcd98f749e5bd8511fbf4ca2c605db96c
Component: engine
2015-08-21 14:27:59 -07:00
2ec9a2ac53
Merge pull request #15218 from calavera/gender_unbiased_names
...
Add more amazing women to the names generator.
Upstream-commit: 008a8ffdd20f710bb177c299d4f3f5a2024894c4
Component: engine
2015-08-21 14:24:49 -07:00
20b08ad6cb
Merge pull request #15507 from clintonskitson/patch_issue_15467
...
added check for bind on create to determine local volume driver
Upstream-commit: 19f7bfcda9ea11806a39a6508d3961649ba8ba5d
Component: engine
2015-08-21 14:23:44 -07:00
48cf51659b
Merge pull request #15709 from Mashimiao/state-separate-part-of-SetRestarting
...
daemon/state: separate part of SetRestarting to setRestarting
Upstream-commit: 9b8cfb6c79904bf74edae7c3fcc317e525f82fc7
Component: engine
2015-08-21 14:21:10 -07:00
7ec0d0652b
Merge pull request #15596 from jfrazelle/hack-dind-its-been-fun
...
docker 1.8+ no longer needs dind
Upstream-commit: 9d22c7a2d561e2b8379b8cf890d5873d529cd122
Component: engine
2015-08-21 13:51:41 -07:00
ce4b3c1927
Merge pull request #15687 from coolljt0725/add_blk_dev_throttling_to_check_config
...
Add CONFIG_BLK_DEV_THROTTLING to check-config.sh
Upstream-commit: 616950b0307cfb76fc3f68649993d39bd2de87ae
Component: engine
2015-08-21 13:48:28 -07:00
0e5e69219f
Windows: Graphdriver should reject create of layer w/o parent
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: a456f20b44637b861740a7dd0102073f6390c452
Component: engine
2015-08-21 13:23:04 -07:00
7b13843714
Merge pull request #15758 from jfrazelle/EOL-fedora-20
...
fedora 20 is EOL remove from rpm builder
Upstream-commit: e6be51a0f93ce5e5213aef2c0f6329b9b3762a4a
Component: engine
2015-08-21 13:15:58 -07:00
43529eceba
Merge pull request #15746 from Microsoft/libcontainer-spec-location
...
Updated spec location for libcontainer
Upstream-commit: 1425b185dbf18ff9061a53f381ef8166aacbc8aa
Component: engine
2015-08-21 11:15:28 -07:00
74f373df66
update hack/dind for 1.8 mounting of cgroups
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: c48ac77840f1aa22a76428e2451ca1ae9cf85a48
Component: engine
2015-08-21 11:13:33 -07:00
24242b6544
fedora 20 is EOL remove from rpm builder
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: ee1304a35e73049221f8f2c485b5aa2684c1725f
Component: engine
2015-08-21 11:01:18 -07:00
589fca3f48
fix a panic when the exec fails to start
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: fcf9daad91d9be24ceddbc4add4d3a8179c9b32c
Component: engine
2015-08-22 00:01:44 +08:00
340de9e282
Merge pull request #15748 from coolljt0725/fix_daemon_start_with_old_running_container
...
Fix docker daemon start with old running container which use thirdparty volume plugin
Upstream-commit: eb7b2ed6bbe3fbef588116d362ce595d6e35fc43
Component: engine
2015-08-21 11:07:02 -04:00
