beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
16813 commits 14 branches 412 tags 338 MiB
Commit graph

1627 commits

Author SHA1 Message Date
Doug Davis
f06620ece3 Move inspect into the loop on InspectExecID test 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-07-17 17:30:24 -07:00
Jessie Frazelle
465192cb28 Merge pull request #14706 from duglin/FixInspectTest 
Fix InspectExecID test
 2015-07-17 14:37:23 -07:00
Arnaud Porterie
98ed9a55f4 Merge pull request #14693 from LK4D4/update_libcontainer 
Update libcontainer
 2015-07-17 13:02:04 -07:00
Sebastiaan van Stijn
a763637eae Merge pull request #13951 from calavera/plugins_path 
Separate plugin sockets and specs.
 2015-07-17 21:11:31 +02:00
Doug Davis
c5c98c31a1 Fix InspectExecID test 
The check for the end of the loop was off by one which is why we saw
errors on the following inpsect() call instead of a timeout

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-07-17 06:46:37 -07:00
Alexander Morozov
ac3f7c71b8 Merge pull request #14698 from duglin/AddErr 
Add missing 'err' to Fatalf to help debug an issue
 2015-07-16 21:42:42 -07:00
Doug Davis
97c5f64001 Add missing 'err' to Fatalf to help debug an issue 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-07-16 20:27:14 -07:00
David Calavera
15cb7dfc9e Merge pull request #14578 from mountkin/fix-rmi-image-not-found 
don't allow deleting the image of running containers
 2015-07-16 18:02:51 -07:00
Alexander Morozov
c86189d554 Update libcontainer 
Replaced github.com/docker/libcontainer with
github.com/opencontainers/runc/libcontaier.
Also I moved AppArmor profile generation to docker.

Main idea of this update is to fix mounting cgroups inside containers.
After updating docker on CI we can even remove dind.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-07-16 16:02:26 -07:00
David Calavera
6c0795747b Separate plugin sockets and specs. 
Check if there is a plugin socket first under `/run/docker/plugins/NAME.sock`.
If there is no socket for a plugin, check `/etc/docker/plugins/NAME.spec` and
`/usr/lib/docker/plugins/NAME.spec` for spec files.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-07-16 14:20:07 -07:00
Derek McGowan
19515a7ad8 Update graph to use vendored distribution client for the v2 codepath 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-07-16 13:13:47 -04:00
Hu Keping
71868228c7 Refactor : Use dockerCmd in integration-cli tests 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-07-17 04:07:12 +08:00
Shijiang Wei
ce6410cd4c don't allow deleting the image of running containers 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2015-07-16 13:14:48 +08:00
Brian Goff
e98a881570 Merge pull request #14624 from vdemeester/14603-dockerCmd-integration-cli-1 
Integration test refactors to use dockerCmd
 2015-07-15 14:03:58 -04:00
Vincent Demeester
5c295460da Use dockerCmd when possible (#14603) 
- integration-cli/docker_cli_attach_test.go
- integration-cli/docker_cli_attach_unix_test.go
- integration-cli/docker_cli_build_test.go
- integration-cli/docker_cli_build_unix_test.go
- integration-cli/docker_cli_by_digest_test.go
- integration-cli/docker_cli_commit_test.go
- integration-cli/docker_cli_config_test.go
- integration-cli/docker_cli_cp_test.go
- integration-cli/docker_cli_create_test.go
- integration-cli/docker_cli_pause_test.go
- integration-cli/docker_cli_port_test.go
- integration-cli/docker_cli_port_unix_test.go
- integration-cli/docker_cli_proxy_test.go
- integration-cli/docker_cli_ps_test.go
- integration-cli/docker_cli_pull_test.go
- integration-cli/docker_cli_push_test.go

- docker_api_attach_test.go
- docker_api_containers_test.go
- docker_api_events_test.go
- docker_api_exec_resize_test.go
- docker_api_exec_test.go
- docker_api_images_test.go
- docker_api_info_test.go

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-07-14 21:52:43 +02:00
Vincent Demeester
4290bdefab Add dockerCmdWithError 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-07-14 08:35:06 +02:00
Jessie Frazelle
35b0223921 Merge pull request #10717 from mrunalp/feature/group_add 
Adds support for specifying additional groups.
 2015-07-13 17:08:05 -07:00
Mrunal Patel
0b7938e845 Adds test for additional groups. 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2015-07-13 14:47:28 -04:00
Antonio Murdaca
d3566fa0b1 Cleanup not needed calls to deleteImages 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-13 20:30:53 +02:00
Alexander Morozov
0f466c36b9 Merge pull request #14500 from runcom/add-diff-emtpy-arg-test 
Add diff command with emtpy string testcase
 2015-07-13 11:30:31 -06:00
Antonio Murdaca
1f963af697 Merge pull request #14586 from Tenk42/14362-Improve-sockRequestRaw-check 
Improve sockRequest and sockRequestRaw check
 2015-07-13 15:59:39 +02:00
Phil Estes
441ae6c943 Merge pull request #14004 from ktraghavendra/13938_container_swappiness 
Add the memory swappiness tuning option to docker.
 2015-07-13 09:22:08 -04:00
Quentin Tayssier
fa6925aa9b Improve sockRequest and sockRequestRaw check 
Signed-off-by: Quentin Tayssier <qtayssier@gmail.com>
 2015-07-13 21:49:08 +09:00
Antonio Murdaca
26ce3f4c90 Add minor vet fixes 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-12 19:16:38 +02:00
Raghavendra K T
921da495d2 Add the memory swappiness tuning option to docker. 
Memory swappiness option takes 0-100, and helps to tune swappiness
behavior per container.
For example, When a lower value of swappiness is chosen
the container will see minimum major faults. When no value is
specified for memory-swappiness in docker UI, it is inherited from
parent cgroup. (generally 60 unless it is changed).

Signed-off-by: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com>
 2015-07-12 13:16:33 +05:30
Jessie Frazelle
703248da20 Merge pull request #13669 from ewindisch/readonly-proc 
Make /proc, /sys, & /dev readonly for readonly containers
 2015-07-10 15:32:13 -07:00
Sebastiaan van Stijn
5bf98dd997 Merge pull request #12856 from duglin/ConfigLocation 
Add support for DOCKER_CONFIG/--config to specify config file dir
 2015-07-10 23:05:49 +02:00
Doug Davis
daced1d303 Add support for DOCKER_CONFIG/--config to specific config file dir 
Carry #11675

Aside from what #11675 says, to me a key usecase for this is to support
more than one Docker cli running at the same time but each may have its
own set of config files.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-07-10 12:51:34 -07:00
Brian Goff
20ac0e6164 Merge pull request #14306 from Microsoft/validatepsfilter 
Validate status= filter to docker ps
 2015-07-10 15:43:01 -04:00
Michael Crosby
1dd2fda394 Merge pull request #13312 from hqhq/hq_enable_cgroupfs 
Add cgroup bind mount by default
 2015-07-10 10:45:05 -07:00
Doug Davis
72b75cd4e7 More extensive testing of new GC of execs 
This is a follow-on to PR #14520.

PR #14520 is the quick fix to get the testing working again.

This PR makes sure that the list of execs associated with  a container goes
from zero to one (as a new exec is run), then back to zero when the exec is
finished.  However, we should be able to query the exec while the container
is still around, and even though the exec isn't listed in the container's
inspect data.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-07-10 07:27:11 -07:00
Doug Davis
899c85b405 Minor fix to the exec inspect test 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-07-10 06:19:03 -07:00
Qiang Huang
f18fb5b3ef Add cgroup bind mount by default 
Libcontainer already supported mount container's own cgroup into
container, with this patch, we can see container's own cgroup info
in container.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-07-10 13:12:09 +08:00
Brian Goff
6e64e0548f Merge pull request #14514 from hqhq/hq_fix_file_leak 
Fix file leak in integration-cli
 2015-07-09 21:52:59 -04:00
Jessie Frazelle
56e8a99b61 Merge pull request #14480 from Microsoft/fix-windows-ci 
Fix Windows CI fail due to GH13866
 2015-07-09 16:37:41 -07:00
Megan Kostick
a8715ea220 Port POST container attach tests 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
 2015-07-09 12:52:45 -07:00
John Howard
c1b524486c Fix Windows CI fail due to GH13866 and patch up tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-07-09 10:09:45 -07:00
Antonio Murdaca
9d84d4c2cc Add diff command with emtpy string testcase 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-09 18:46:38 +02:00
Phil Estes
37771c122b Merge pull request #14498 from calavera/fix_volume_from_references 
Fix volumes-from mount references.
 2015-07-09 12:34:27 -04:00
Alexander Morozov
5369b6cf29 Merge pull request #14348 from sunyuan3/TestPullImageWithAllTagFromCentralRegistry 
Add TestPullImageWithAllTagFromCentralRegistry test case.
 2015-07-09 09:56:53 -06:00
David Calavera
3d029c3bf3 Fix volumes-from mount references. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-07-09 09:01:57 -06:00
Qiang Huang
d28b0ba115 Fix file leak in integration-cli 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-07-09 18:52:18 +08:00
Alexander Morozov
67058e388b Remove prefix dots from inspects in tests 
Dots prepended to key in inspectField function

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-07-08 12:41:05 -07:00
Yuan Sun
c9a4c1401f Add TestPullImageWithAllTagFromCentralRegistry test case. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-07-08 19:47:33 +08:00
Lei Jitang
289ee90b04 Fix copy from a "created" container. Fixes #14420 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-07-08 11:15:09 +08:00
Jessie Frazelle
2cd417df73 Merge pull request #14388 from runcom/14316-fix-events-filters 
Fix combined image events filters
 2015-07-07 18:08:56 -07:00
Michael Crosby
a5283d2ff3 Merge pull request #13866 from brahmaroutu/runOOM_13766 
RunOOM test should check to see if Oom Control is enabled
 2015-07-07 16:21:46 -07:00
Arnaud Porterie
e3966c1031 Merge pull request #14380 from sunyuan3/TestRunCapAddCHOWN 
add TestRunCapAddCHOWN test case
 2015-07-07 12:36:14 -07:00
Brian Goff
10bbf62081 Merge pull request #14375 from coolljt0725/fix_test_events_default_empty 
Fix test TestEventsDefaultEmpty. Fixes #14360
 2015-07-07 10:37:40 -04:00
Antonio Murdaca
61418e39d5 Merge pull request #14428 from sunyuan3/TestPushBusyboxImage 
Correct wrong comment of TestPushBusyboxImage.
 2015-07-07 14:44:08 +02:00