fb50eb6afa
Merge pull request #14315 from Pensu/14176-fix-run-table-rendering
...
Fixing the table rendering in reference/run.md
Upstream-commit: 9c96304a86b14cb80af46c45c516c38ed4df8ba2
Component: engine
2015-07-07 18:09:53 -07:00
38036b2494
Merge pull request #14388 from runcom/14316-fix-events-filters
...
Fix combined image events filters
Upstream-commit: 2cd417df7378e52c05569fa4340f5126d03fbaa8
Component: engine
2015-07-07 18:08:56 -07:00
a85dcd341c
Merge pull request #14417 from crosbymichael/attach-stdin
...
Always attach STDIN if -i,--interactive is specified
Upstream-commit: 25151eb24eaacdf3d2c943f71a441107cd859c21
Component: engine
2015-07-07 18:07:46 -07:00
d7b0abae1e
Merge pull request #14432 from coolljt0725/umount_rootf_on_cp_fail
...
Always umount container rootfs and volumes on docker cp failed
Upstream-commit: 045ccc4326c596c808711beda9a4f566d3ad5d61
Component: engine
2015-07-07 21:04:16 -04:00
9b1a73e4d4
Merge pull request #14430 from zmarouf/master
...
fix(docs): Small typoes in the Supported installation page
Upstream-commit: 81c30c3303288d53abdf47daa1ef5dada89d48b5
Component: engine
2015-07-07 18:00:19 -07:00
9147778cbe
Merge pull request #14369 from maximkulkin/14123-dockerize-disk-with-non-en-locale
...
Fix dockerize-disk.sh working in non-en locale
Upstream-commit: 16f8afb4519ff9dbbb2ed386d0d00d3da54997b9
Component: engine
2015-07-07 17:51:29 -07:00
9cad936b35
Merge pull request #14335 from konstruktoid/issue_14263
...
Mention experimental build
Upstream-commit: e13b7862aba59cd8904b49a264e17305cb09c974
Component: engine
2015-07-07 17:49:37 -07:00
33df474b64
Merge pull request #13835 from cpuguy83/gen-prc
...
generate plugin clients via template
Upstream-commit: 806b3fa14529a97dfad8fad8ed2a21b26de94492
Component: engine
2015-07-07 17:17:39 -07:00
237be75b88
Merge pull request #13866 from brahmaroutu/runOOM_13766
...
RunOOM test should check to see if Oom Control is enabled
Upstream-commit: a5283d2ff3546c1fe946aa8a1ddc076b08d5700c
Component: engine
2015-07-07 16:21:46 -07:00
67b701bb4d
Merge pull request #14427 from Evalle/14404-add-Metatag
...
Adding Group Metatag
Upstream-commit: b2b367a6addd521c857607f613ea68c70ada4721
Component: engine
2015-07-07 16:43:20 -06:00
bb8fa518d6
Merge pull request #14415 from calavera/warning_on_no_dev_sync
...
Put dm.override_udev_sync_check back.
Upstream-commit: f7ea9114d666541fe1fa980b2cdd1f6360ed31de
Component: engine
2015-07-07 14:35:49 -07:00
682ea83bb3
Warn when udev_sync is not supported.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: e27131519f610178fd8adfc4b87c7bc2521a562f
Component: engine
2015-07-07 15:10:24 -06:00
4c7faac4a7
Merge pull request #14380 from sunyuan3/TestRunCapAddCHOWN
...
add TestRunCapAddCHOWN test case
Upstream-commit: e3966c103123ca2162ccf3ea8b463367ab55cb31
Component: engine
2015-07-07 12:36:14 -07:00
c17c7fce57
Revert "Fix implicit DeviceMapper selection"
...
This reverts commit 0a376291b2213699f986a7bca1cc8c4f4ed00f8d.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 9af7afb9eb138bdba33c22445f36f41e5aa26bd1
Component: engine
2015-07-07 12:27:19 -07:00
2844b01d8c
Merge pull request #14441 from embray/patch-1
...
Update windows.md
Upstream-commit: a14b1f1e9dda91820c3c929cd90c9ad44fbd2404
Component: engine
2015-07-07 15:14:37 -04:00
6d7c94a01e
Merge pull request #14398 from ankushagarwal/gitignore-iml
...
Removing .idea from .gitignore
Upstream-commit: a8f8748f7aed62c1633bb8fbaeca6fb7c929033d
Component: engine
2015-07-07 12:10:54 -07:00
9752456dbb
Merge pull request #14094 from rghv/master
...
Added entries of a few ancient Indian mathematicians who did cool things centuries ago.
Upstream-commit: bfc5966d0b787a059320c927d4cf530e301667b7
Component: engine
2015-07-07 12:03:28 -07:00
42e3d907c7
Merge pull request #14422 from Microsoft/10662-dumpstacks
...
Windows: Win32 event for sigusr1 linux equivalence
Upstream-commit: 2ea4d90da406c6a826d2699e502d2ac312289c98
Component: engine
2015-07-07 10:54:00 -07:00
d1a21ef136
Update windows.md
...
With apologies (it wasn't clear from the contributing guidelines how this project feels about PRs for one or two word doc fixes).
Signed-off-by: Erik M. Bray <erik.m.bray@gmail.com >
Upstream-commit: 12c85f3671e2bc981eb246e73daa7ecf37fb274f
Component: engine
2015-07-07 13:51:17 -04:00
0b57b151dd
Merge pull request #14421 from dmcgowan/fix-duplicate-layers
...
Fix duplicate layers in manifest
Upstream-commit: cd72c7f3bb43a39d68baec776f200d20a645a48c
Component: engine
2015-07-07 10:50:45 -07:00
6127908005
Merge pull request #14375 from coolljt0725/fix_test_events_default_empty
...
Fix test TestEventsDefaultEmpty. Fixes #14360
Upstream-commit: 10bbf62081ac85b17a93d79ba43eec43bebe468c
Component: engine
2015-07-07 10:37:40 -04:00
63dcc74119
Merge pull request #14307 from kolyshkin/readme-fixes
...
README.md: fix cgroups/namespaces name and link
Upstream-commit: 833cdd28ed668291bca8eb5ee5ba73a77523eafb
Component: engine
2015-07-07 06:09:20 -07:00
1d7351e687
Merge pull request #14428 from sunyuan3/TestPushBusyboxImage
...
Correct wrong comment of TestPushBusyboxImage.
Upstream-commit: 61418e39d534fcd4cf13d5559133da6d0834feb0
Component: engine
2015-07-07 14:44:08 +02:00
eb7ca7510b
Always umount container rootfs and volumes on docker cp failed
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 13c36ce65ec02c7d2ac564ccc9d4f69e92760d9a
Component: engine
2015-07-07 20:27:45 +08:00
7fddfdcd08
fix(docs): Small typoes in the Supported installation page
...
-> https://docs.docker.com/installation/
Signed-off-by: Zeid Marouf <zeid.marouf@gmail.com >
Upstream-commit: 3bee3a2927da2187a0897ad20c3984afd67d6bba
Component: engine
2015-07-07 11:09:12 +02:00
13acfe3c90
Correct wrong comment of TestPushBusyboxImage.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: f244ed2531721ec8b3240d1ec8e2bd9f9acf466c
Component: engine
2015-07-07 16:10:37 +08:00
f43c5d8e7a
Merge pull request #14406 from duglin/tweakCmdlineHelp
...
Fix example in cmdline help text to have correct output
Upstream-commit: 270d7e1af8075f8c05f820d4a9a40f0aebd3ca28
Component: engine
2015-07-07 09:26:13 +02:00
48ac43bc1b
Merge pull request #13987 from larsks/bug/7583
...
Update docker commit man page re: volumes
Upstream-commit: 244141a8aa4b80c6e508eb408a536a56b783845b
Component: engine
2015-07-07 09:16:54 +02:00
7eb8fa7601
Adding Group Metatag
...
Signed-off-by: evalle <shmarnev@gmail.com >
Upstream-commit: 0db7c2a9a686a4101f11ab362e3ab8327b9ea591
Component: engine
2015-07-07 09:08:55 +02:00
48bdf6fd55
Merge pull request #14275 from ankushagarwal/runtime-metrics-docs-stats
...
Add Docker stats to runtime metrics article
Upstream-commit: 81964ca555aa595600b0d706ad68783e12919627
Component: engine
2015-07-07 08:21:31 +02:00
02dcc46d4e
Merge pull request #14095 from timwraight/master
...
Clarify .dockerignore example for Markdown files
Upstream-commit: a25ee91f1c163ef77539eafd0509ccfcf619106d
Component: engine
2015-07-07 07:59:39 +02:00
a32ec20c5e
daemon.md: fix placement of exec driver heading
...
Options for zfs storage driver were incorrectly placed
under 'exec driver options' header. Move the header to
the correct place.
Signed-off-by: Kir Kolyshkin <kir@openvz.org >
Upstream-commit: 68efb27e990a52478d9927911757a07910244dc5
Component: engine
2015-07-06 22:51:31 -07:00
5bedc178b2
README.md: fix cgroups/namespaces name and link
...
The features Docker relies on are called "cgroups" and "namespaces",
so fix the language accordingly.
Also for cgroups, provide a link to Linux kernel documentation that
is more relevant (and deep) than the Wikipedia article.
Cc: Ankush Agarwal <ankushagarwal11@gmail.com >
Signed-off-by: Kir Kolyshkin <kir@openvz.org >
Upstream-commit: 7e309aed4e23ad5dfa94b9279be9a4b075aab0a8
Component: engine
2015-07-06 22:45:56 -07:00
5bdb87278d
Fix test TestEventsDefaultEmpty. Fixes #14360
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 28028312183126102b8eb260b7112cc37dd5aca9
Component: engine
2015-07-07 11:27:00 +08:00
584e40e2dd
Merge pull request #14409 from vdemeester/fix-testRequires-network
...
Fix integration tests with testRequires(c, Network)
Upstream-commit: 58edd21c05e69a7dfd522f5971fcf994acd7cb41
Component: engine
2015-07-06 23:08:34 -04:00
800d4df14d
Windows: Win32 event for sigusr1 linux equivalence
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f4b08c7f5eed2eece239086f260eee9e736ee227
Component: engine
2015-07-06 18:58:53 -07:00
4813a5b1aa
Fix example in cmdline help text to have correct output
...
Showing "$$ exit 13" caught my eye and wasn't correct.
While in there I also made it so the following paragraph didn't go past 80 chars
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: aea0fd0115ab99a9797cc2ba4d9ef530f76c3ecc
Component: engine
2015-07-06 17:51:09 -07:00
36eb2b9f9d
Fix duplicate layers in manifest
...
Currently the layer array is initialized with the first layer then the first layer is appened to the layer list. Adding the first layer twice causes the layer to appear twice in the manifest, making a duplicate push and pull attempt occur.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 35081ea4b6711b1cfccb67b0f0d691b7adc85ff6
Component: engine
2015-07-06 17:31:06 -07:00
0958d62678
Merge pull request #14414 from jfrazelle/fix-rpms
...
fix rpms
Upstream-commit: 2905fe4806cd00ed267138b4e2b94a80a2b7ad0d
Component: engine
2015-07-06 17:12:38 -07:00
d3498560e9
Merge pull request #14154 from chrismckinnel/master
...
Fix a broken link to .dockerignore
Upstream-commit: 6ffce0131c6be276d5919dff0500db7a67065b4d
Component: engine
2015-07-06 15:48:25 -07:00
8d8ca6624e
Add Docker stats to runtime metrics article
...
Fixes #13170
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 274c838ced96e1b7f9b6c5854856004d0b130627
Component: engine
2015-07-06 15:40:26 -07:00
2168e591ab
Always attach STDIN if -i,--interactive is specified
...
There is no reason to error out or not do what the user expects when -i
is specified on the cli. We should always attach to the stdin of the
container in this situation.
Closes #14390
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 691b2851f7b745d225a2698b964cf60f55a0c4d7
Component: engine
2015-07-06 15:24:23 -07:00
7570a24c80
RunOOM test should check to see if Oom Control is enabled
...
closes #13766
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: e7fb38410dfcbdd83df7c9e16806bbf8fc3af8b5
Component: engine
2015-07-06 21:15:55 +00:00
863d4d7ae6
fix rpms
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 76a853de6eee072e4874a64e4c5ffcceacdccbf1
Component: engine
2015-07-06 14:14:26 -07:00
7c1cdd2da7
Fix integration tests with testRequires(c, Network)
...
It seems http://hub.docker.com is not accessible anymore, so switching
to https://hub.docker.com for testRequires(c, Network).
Adds a Timeout check on the TestRequirement to *panic* if there is a
timeout (fail fast).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6e4c6da81916e25081c32d3e5f8880ef4d03ad36
Component: engine
2015-07-06 22:08:35 +02:00
c016079ee2
Add some missing events to the API docs
...
Closes #14407
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 4bb3c253e83454e00381723f17ca69dd4e9b3d7a
Component: engine
2015-07-06 11:39:37 -07:00
07c93dcdba
Merge pull request #14127 from vbatts/vbatts-dm-active-external
...
pkg/devicemapper: external device activation
Upstream-commit: c7492126ef68786a4c57e5e2affb7cba293be652
Component: engine
2015-07-06 14:07:33 -04:00
810d603141
Removing .idea from .gitignore
...
The project cannot include every editor's
ignore files. Contributers can use a local
global gitignore : https://help.github.com/articles/ignoring-files
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: b0f7a1c62cc04778181dc2c19b7180c3353a2514
Component: engine
2015-07-06 10:41:38 -07:00
d49aa7e5dc
Update docker commit man page re: volumes
...
Update the man page for 'docker commit' to make explicit the fact that
'commit' does not save data in volumes.
Addresses comments in #7583
Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com >
Upstream-commit: a9747895375a27e0f4d46d9cf8f501815e5b2642
Component: engine
2015-07-06 10:16:21 -04:00
f17280b05c
Merge pull request #14344 from Mashimiao/add-json-check-for-execcreate
...
api/server: Add missing json check
Upstream-commit: 26a35dd09b4faf39a99ff224f5cd4e14ae368585
Component: engine
2015-07-05 19:04:12 -04:00
