Commit Graph

21804 Commits

Author SHA1 Message Date
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
9f51cb17df Update run.md
Put a space after the `###` in the Example section. On the github parser the result file looks ok, but in the docker page (<https://docs.docker.com/reference/run/>) looks ugly.

Signed-off-by: Átila Camurça <camurca.home@gmail.com>
Upstream-commit: 7121a2ae46510ce985073b1f18f1740364ec74a7
Component: engine
2015-07-08 16:09:40 -03: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
bf03765c68 Adding a warning to Ubuntu script
Signed-off-by: Peeyush Gupta <gpeeyush@linux.vnet.ibm.com>
Upstream-commit: 7e4725cb66c760af91a3f68bf81c0053d007bdc0
Component: engine
2015-07-08 12:28:30 +05:30
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
dd092e2fa2 Merge pull request #14379 from Mashimiao/add-missing-stream-close
api/client: close the returned io.ReadCloser
Upstream-commit: 159e830068b46793a51f6104802b299c3a10fb7b
Component: engine
2015-07-07 21:15:45 -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
5353b0d726 Fix docs for oom-kill-disable
Addresses: #14440

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: c92fb4d517281033a96fa05e0f1eadb899bfe2a3
Component: engine
2015-07-08 09:51:10 +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
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
017d6047d5 added ability to iterate over all indexes and use index.Iterate() instead of ReadDir() to walk over the graph
Signed-off-by: Roman Strashkin <roman.strashkin@gmail.com>
Upstream-commit: cc955ae73c8aa234e0c41bdb65f111be79b32b90
Component: engine
2015-07-07 22:13:28 +03: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
5ce830016b devicemapper: Check loop devices of existing pool
Often it happens that docker is not able to shutdown/remove the thin
pool it created because some device has leaked into some mount name
space. That means device is in use and that means pool can't be removed.

Docker will leave pool as it is and exit. Later when user starts the
docker, it finds pool is already there and docker uses it. But docker
does not know it is same pool which is using the loop devices. Now
docker thinks loop devices are not being used. That means it does not
display the data correctly in "docker info", giving user wrong information.

This patch tries to detect if loop devices as created by docker are
being used for pool and fills in the right details in "docker info".

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: bebf53443981c70a6a714ea518dc966a0e2b6558
Component: engine
2015-07-07 14:13:29 -04: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