c8344b3dc3
Windows: Remove meaningless warnings on docker info
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 615681f5177cef974d516d5814195c768e773dd2
Component: engine
2015-07-10 10:06:20 -07:00
aae04e2dff
Merge pull request #14514 from hqhq/hq_fix_file_leak
...
Fix file leak in integration-cli
Upstream-commit: 6e64e0548f30fd9d1a368ac5ea5bde9dec38c162
Component: engine
2015-07-09 21:52:59 -04:00
01e9709b3d
Merge pull request #14512 from Microsoft/10662-fixdockerinfo
...
Windows: Fix docker info not to SIGSEGV
Upstream-commit: 4893ecc112213d3dcdb5421c1a605dbc0e339854
Component: engine
2015-07-09 17:16:49 -07:00
8595d62a4c
Windows: Fix docker info not to SIGSEGV
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4348ad68f818ed72752bcf66d30f53cf15598bb4
Component: engine
2015-07-09 16:37:54 -07:00
0f6e3890ae
Merge pull request #14480 from Microsoft/fix-windows-ci
...
Fix Windows CI fail due to GH13866
Upstream-commit: 56e8a99b617588f6fce5b8a311fa7d01db67c7e6
Component: engine
2015-07-09 16:37:41 -07:00
92adaadd4b
Merge pull request #14505 from kostickm/12905-port-container-attach-tests
...
Port POST container attach tests
Upstream-commit: e64af7a70ea1220d08bc2d11ad0d3974ee043aa0
Component: engine
2015-07-09 16:27:03 -07:00
4269f6c0bd
Merge pull request #14509 from Microsoft/10662-remove-linux
...
Windows: Remove linux
Upstream-commit: 7df186dac7422464aca0052232a6754e3f8125fa
Component: engine
2015-07-09 15:42:53 -07:00
18d3d40382
Merge pull request #14476 from crosbymichael/execid-growth-fix
...
Prevent uncontrolled exec config growth
Upstream-commit: 382799a64253a1da46613a2290a2f59d02710df8
Component: engine
2015-07-09 15:36:11 -07:00
b9f61dea35
Windows: Remove linux
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 7d3bbe9d34e3fc7351c8b612c6f0c9438d360a7a
Component: engine
2015-07-09 15:15:25 -07:00
cf30b7f14e
Merge pull request #14507 from estesp/remove-old-roadmap
...
No need for the old project/ROADMAP.md
Upstream-commit: a29af0cc429769bc2514a37f44e64c9ebb04be56
Component: engine
2015-07-09 15:11:26 -07:00
f217526e9e
No need for the old project/ROADMAP.md
...
Now that we have ROADMAP.md in the root of the project, the outdated and
non-specific ROADMAP.md in project/ can be removed.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 548caddaf670fd6837e4e74a38e58a58ed6088b3
Component: engine
2015-07-09 18:05:09 -04:00
e0ffc7b501
Use mark and sweep for exec command removal
...
This takes the final removal for exec commands in two steps. The first
GC tick will mark the exec commands for removal and then the second tick
will remove the config from the daemon.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 34ab8c432691934745d66ee94ff4aec1120518e0
Component: engine
2015-07-09 14:51:10 -07:00
c104f21d9a
Merge pull request #14484 from LK4D4/check_dockerinit_lxc
...
Check dockerinit only if lxc driver is used
Upstream-commit: c9e2a71509743ea38baafb71d7efa8b205af14b4
Component: engine
2015-07-09 14:47:03 -07:00
39f872f4ab
Merge pull request #14457 from Djelibeybi/oraclelinux-rpms
...
Add support for building docker-engine RPM on Oracle Linux 7.
Upstream-commit: 0f9c458730103cacc5568f05272be48213535ab8
Component: engine
2015-07-09 14:44:42 -07:00
68020cd75e
Change generate.sh so that the yum command for packages remains generic across distros.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
Upstream-commit: f18c4f23cc98ba4fd4fb3241571ce31062eda717
Component: engine
2015-07-10 07:34:47 +10:00
fc8053f2ba
Help the release captain to announce the released packages.
...
Add a few links to the release output that the release captain can use to announce the release.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: eae99e9da70ddd1d2d452abb063199d78ca65fb9
Component: engine
2015-07-09 14:19:05 -06:00
f35886e35f
Port POST container attach tests
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
Upstream-commit: a8715ea2207966e649e66a4fafcf34517234061f
Component: engine
2015-07-09 12:52:45 -07:00
448d2ef599
Fix Windows CI fail due to GH13866 and patch up tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c1b524486c80932f0c97b935f1ff9e41d30eab4e
Component: engine
2015-07-09 10:09:45 -07:00
10798d6350
Merge pull request #14498 from calavera/fix_volume_from_references
...
Fix volumes-from mount references.
Upstream-commit: 37771c122b3d1cf1e68ef2887586361e48792fef
Component: engine
2015-07-09 12:34:27 -04:00
f6f9fbadc6
Merge pull request #14348 from sunyuan3/TestPullImageWithAllTagFromCentralRegistry
...
Add TestPullImageWithAllTagFromCentralRegistry test case.
Upstream-commit: 5369b6cf29aafce9f335e8ab77a41575ac66ad5f
Component: engine
2015-07-09 09:56:53 -06:00
81d1e83005
Fix volumes-from mount references.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3d029c3bf335bc2867d1efc803096d2912b81799
Component: engine
2015-07-09 09:01:57 -06:00
9c6eed3d0d
Fix file leak in integration-cli
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: d28b0ba115f44f7a49cfc442d5eff146e57c3167
Component: engine
2015-07-09 18:52:18 +08:00
d48369012b
Merge pull request #14381 from Mashimiao/cleanup-client-unused-code
...
api/client: unify format of args check
Upstream-commit: 0afd7bde02c7f03b9e8ebca6a7d8953b8697e55a
Component: engine
2015-07-09 06:42:57 -04:00
8ed1a187ce
Merge pull request #13989 from squaremo/netplugin_docs
...
Mention network driver plugins and point to protocol docs
Upstream-commit: f0e90606cdf272407e0d79d4746039da60c60df2
Component: engine
2015-07-09 09:27:05 +02:00
d257ad21f6
Merge pull request #14241 from ZJU-SEL/fix-ulimit-usage
...
Fix ulimit usage of nproc
Upstream-commit: ca3e4ccb809dc283c91deb304876a211eb546265
Component: engine
2015-07-09 08:23:26 +02:00
228bda77d9
Clarify that nproc is not for per container
...
Fix ulimit nproc spec in daemon
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn >
Upstream-commit: 54ac3ad736d633956a89aa478c6eb89d648a34df
Component: engine
2015-07-09 02:40:47 +00:00
6867b43d70
Merge pull request #14456 from Djelibeybi/issue14042
...
Remove RPM specific dependencies
Upstream-commit: cab02a5bbcb6f6bc0d1cfd61820a8134bd5ed525
Component: engine
2015-07-08 17:17:55 -07:00
c6bfbb6e7e
Merge pull request #14479 from LK4D4/fix_test_inspect
...
Remove prefix dots from inspects in tests
Upstream-commit: 885e7f2a1ec9964fac09f77b0de3a9e0c09dd7c1
Component: engine
2015-07-08 15:10:51 -07:00
30c9ca075c
Merge pull request #14402 from mrjana/mh
...
Vendoring libnetwork
Upstream-commit: 2df65c32d71cc9dff059f03469f770fa746bca75
Component: engine
2015-07-08 17:15:13 -04:00
48bfe58a0d
Check dockerinit only if lxc driver is used
...
This allow you to run dynamically linked docker without compiling
dockerinit.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 96bc377a8d293cf786722ebb0ff89a81d63e43ed
Component: engine
2015-07-08 14:12:51 -07:00
6d71e61742
Add GC loop to clean exec command refs on daemon
...
This adds an event loop for running a GC cleanup for exec command
references that are on the daemon. These cannot be cleaned up
immediately because processes may need to get the exit status of the
exec command but it should not grow out of bounds. The loop is set to a
default 5 minute interval to perform cleanup.
It should be safe to perform this cleanup because unless the clients are
remembering the exec id of the process they launched they can query for
the status and see that it has exited. If they don't save the exec id
they will have to do an inspect on the container for all exec instances
and anything that is not live inside that container will not be returned
in the container inspect.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 5f017bba48e5c763157e1b35a5edea64cc41fc6a
Component: engine
2015-07-08 13:47:59 -07:00
4fadb58803
Remove prefix dots from inspects in tests
...
Dots prepended to key in inspectField function
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 67058e388b596392f7aceb7ecd6b38f6f2ff2de1
Component: engine
2015-07-08 12:41:05 -07:00
f9a4f23ebb
Merge pull request #14477 from Microsoft/10662-runconfig-oopsie
...
Windows: Wrong build tag in runconfig
Upstream-commit: 42eb82ae92289514222be3b475209c3e705e35dc
Component: engine
2015-07-08 15:34:05 -04:00
36e02b92ba
Merge pull request #14459 from lexandro/add-dockery-to-client-libs
...
Adding dockery as client lib to the docs
Upstream-commit: 2f566f747b85ab303c12d7a7fc2637c661f87837
Component: engine
2015-07-08 20:52:24 +02:00
11bea1dd06
Windows: Wrong build tag in runconfig
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4cd930169212adfdca9d1d514f13e4e8fba7929d
Component: engine
2015-07-08 11:38:28 -07:00
51dfe1d73a
Remove exec config from container after exit
...
This removes the exec config from the container after the command exits
so that dead exec commands are not displayed in the container inspect.
The commands are still kept on the daemon so that when you inspect the
exec command, not the container, you are still able to get it's exit
status.
This also changes the ProcessConfig to a pointer.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 04c9f86bdcf9f42deb09df76922a8c61205721a2
Component: engine
2015-07-08 10:55:42 -07:00
846e4076e7
Merge pull request #14471 from icecrime/14451_devmapper_startup_panic
...
Fix panic on devicemapper initialization
Upstream-commit: 3833c990e70fa691ce7d609740094e88e1a37af7
Component: engine
2015-07-08 11:18:00 -06:00
a095147db9
Fix panic on devicemapper initialization
...
The ability to save and verify base device UUID (#13896 ) introduced a
situation where the initialization would panic when removing the device
returns EBUSY.
Functions `verifyBaseDeviceUUID` and `saveBaseDeviceUUID` now take the
lock on the `DeviceSet`, which solves the problem as `removeDevice`
assumes it owns the lock.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: f08989902374a517b1f8e5e0bfd3b4ea59e5ba27
Component: engine
2015-07-08 09:10:20 -07:00
f310d0a0b6
Add TestPullImageWithAllTagFromCentralRegistry test case.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: c9a4c1401fc79d6cdee222a2b82cdb8379402552
Component: engine
2015-07-08 19:47:33 +08:00
b21ee30343
Adding dockery as client lib to the docs
...
Signed-off-by: Robert Stern <lexandro2000@gmail.com >
Upstream-commit: cd454fef5a7bc965122efc7ecf4de2f6a29bc96b
Component: engine
2015-07-08 12:09:34 +02:00
03b04678dd
api/client: unify format of args check
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 9a4cbb358d7b839611b86856c73683e0499d681d
Component: engine
2015-07-08 17:29:47 +08:00
414a101271
Add support for building docker-engine RPM on Oracle Linux 7.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
Upstream-commit: 0117330ae7da7dc77d27c551fb298d842afc3890
Component: engine
2015-07-08 16:12:19 +10:00
fe10418da9
Remove specific dependencies and let RPM auto-generate the dependencies on libraries during build.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
Upstream-commit: e3b5889783d5e83a9cecc0867e7af73d5fd023f0
Component: engine
2015-07-08 15:30:42 +10:00
1575e54fe6
Merge pull request #14429 from coolljt0725/fix_cp_created_container
...
Fix copy from a "created" container. Fixes #14420
Upstream-commit: f5ebcfe1dcc1974425155ae9d85a750573af9625
Component: engine
2015-07-07 22:27:01 -06:00
13ea01e391
Fix copy from a "created" container. Fixes #14420
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 289ee90b04a2315cd36d6ff363b41c89f8ebf2aa
Component: engine
2015-07-08 11:15:09 +08:00
a462e56268
api/client: close the returned io.ReadCloser
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 91a496055c3e45ab3fba8e643475adb618581e1f
Component: engine
2015-07-08 10:06:25 +08:00
78101e16cc
Merge pull request #14100 from rhvgoyal/overlay-docker-inspect
...
overlay: Export metadata for container and image in docker-inspect
Upstream-commit: 2fe51ecee75801b6a937801ccd2839335a3f8c88
Component: engine
2015-07-07 18:11:27 -07:00
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
