59e5fcdd6a
Update filtering chapters on ps/images references
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 61de442c49a56f9fc6f82174c97e1229e8aa39f2
Component: engine
2015-08-27 08:47:03 +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
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
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
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
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
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
