clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-04-28 19:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,096 Commits 9 Branches 112 Tags
os-release
Commit Graph

2115 Commits

Author SHA1 Message Date
Phil Estes
1f9557ac66 Merge pull request #17166 from echo33/docker_cli_diff_test 
use of checkers on docker_cli_diff_test.go
 2015-10-19 08:25:32 -04:00
Phil Estes
1c783567c0 Merge pull request #17167 from liaoqingwei/16756-docker_cli_inspect_experimental_test.go 
Use of checkers on docker_cli_inspect_experimental_test.go
 2015-10-19 08:21:17 -04:00
liaoqingwei
f3b2b8700f Use of checkers on docker_cli_inspect_experimental_test.go. 
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
 2015-10-19 19:44:04 +08:00
weiyan
7be79767c1 use of checkers on docker_cli_diff_test.go 
Signed-off-by: weiyan <weiyan3@huawei.com>
 2015-10-19 19:07:59 +08:00
Antonio Murdaca
eaa1fc41c6 Merge pull request #16897 from sunyuan3/docker_cli_rm_test 
use of checkers on docker_cli_rm_test.go
 2015-10-19 09:14:23 +02:00
Vincent Demeester
cfdb954303 Merge pull request #17162 from echo33/docker_cli_exec_unix_test 
use of checkers on docker_cli_exec_unix_test.go
 2015-10-19 08:54:42 +02:00
weiyan
d65ac42ca8 use of checkers on docker_cli_exec_unix_test.go 
Signed-off-by: weiyan <weiyan3@huawei.com>
 2015-10-19 15:14:59 +08:00
Yuan Sun
0780ddc498 use of checkers on docker_cli_rm_test.go 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-10-19 10:42:56 +08:00
Vincent Demeester
bece5b82a8 Merge pull request #17008 from liaoqingwei/dev1 
Update testcases: use of checkers on docker_cli_nat_test.go
 2015-10-18 18:11:02 +02:00
liaoqingwei
26ae6d6b36 Use of checkers on docker_cli_nat_test.go. 
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
 2015-10-18 20:02:55 +08:00
Sebastiaan van Stijn
cffd50752c Merge pull request #17056 from vdemeester/16756-integration-cli-checkers-api-build 
Vendoring new go-check checkers and use checker for docker_api_build_test.go
 2015-10-17 08:50:51 -07:00
Vincent Demeester
253f975fdb Use checker assert for docker_api_build_test.go 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-17 14:28:13 +02:00
Brian Goff
9b1fb0d45b Merge pull request #16871 from ZJU-SEL/fix_version_test 
update docker_cli_version_test.go
 2015-10-17 08:02:18 -04:00
David Calavera
c3f42b29a8 Merge pull request #17113 from mountkin/validate-filter 
make sure the value of the dangling filter is correct
 2015-10-16 16:32:11 -07:00
Tibor Vass
365a0db0f0 Merge pull request #17046 from mavenugo/dopts 
driver-opts for network create
 2015-10-16 15:23:59 -07:00
David Calavera
ec7c368ff0 Merge pull request #16901 from WeiZhang555/rmi-inte 
Update integration test `integration-cli/docker_cli_rmi_test.go` with Assert
 2015-10-16 15:23:00 -07:00
Vincent Demeester
d8b4471a59 Merge pull request #16977 from mountkin/refactor-test 
refactor integration test to use checkers
 2015-10-17 00:22:03 +02:00
David Calavera
258357857b Merge pull request #17065 from ZJaffee/api-exec-resize-test 
cleaned up integration-cli/docker_api_exec_resize_test.go
 2015-10-16 14:59:06 -07:00
Madhu Venugopal
6f3eb994b5 Pass network driver option in docker network command 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-16 14:33:54 -07:00
Vincent Demeester
c56b02b284 Merge pull request #17081 from ZJaffee/api_network_test 
Cleaned up integration-cli/docker_api_network_test.go
 2015-10-16 23:14:17 +02:00
Brian Goff
84be89a273 Merge pull request #16969 from zhangjianfnst/16756-improve-integration-cli 
Use c.Assert in integration-cli/docker_cli_logs_test.go
 2015-10-16 16:55:44 -04:00
Zachary Jaffee
7b6bca5af1 cleaned up integration-cli/docker_api_exec_resize_test.go 
Signed-off-by: Zachary Jaffee <zij@case.edu>
 2015-10-16 13:22:40 -04:00
Vincent Demeester
2afdab4454 Merge pull request #17100 from WeiZhang555/port-inte 
update docker_cli_port_test.go with Assert
 2015-10-16 19:06:14 +02:00
Vincent Demeester
71982d8e57 Merge pull request #17105 from liaoqingwei/dev3 
Use of checkers on docker_cli_pause_test.go.
 2015-10-16 17:36:56 +02:00
David Calavera
f9026e2b7b Merge pull request #17078 from kevinkucharczyk/api_version_test 
Clean up integration-cli/docker_api_version_test.go
 2015-10-16 08:26:53 -07:00
Zhang Wei
1ae4eeb813 update docker_cli_port_test.go with Assert 
Part of #16756

Use c.Assert instead of condition judgement

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-10-16 22:58:51 +08:00
Shijiang Wei
98c1a412b4 make sure the value of the dangling filter is correct 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2015-10-16 22:09:32 +08:00
Brian Goff
835fbee9a2 Merge pull request #17053 from liaoqingwei/dev2 
use of checkers on docker_cli_network_unix_test.go
 2015-10-16 09:36:59 -04:00
liaoqingwei
851a533a82 Use of checkers on docker_cli_pause_test.go. 
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
 2015-10-16 21:07:02 +08:00
liaoqingwei
9e3db08363 Use of checkers on docker_cli_network_unix_test.go. 
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
 2015-10-16 16:56:40 +08:00
Kevin P. Kucharczyk
6f1b5946b1 Clean up integration-cli/docker_api_version_test.go 
Signed-off-by: Kevin P. Kucharczyk <kevinkucharczyk@gmail.com>
 2015-10-16 07:03:39 +02:00
Vincent Demeester
1052ff674c Merge pull request #17073 from ZJaffee/api_events_test 
Cleaned up integration-cli/docker_api_events_test.go
 2015-10-16 00:22:29 +02:00
Zachary Jaffee
7345050e4d Cleaned up integration-cli/docker_api_network_test.go 
Signed-off-by: Zachary Jaffee <zij@case.edu>
 2015-10-15 13:37:54 -04:00
Zachary Jaffee
7aab43e8d4 Cleaned up integration-cli/docker_api_logs_test.go 
Signed-off-by: Zachary Jaffee <zij@case.edu>
 2015-10-15 13:33:31 -04:00
Zachary Jaffee
176d8c5a14 Cleaned up integration-cli/docker_api_events_test.go 
Signed-off-by: Zachary Jaffee <zij@case.edu>
 2015-10-15 12:40:36 -04:00
Vincent Demeester
0f00c36d65 Merge pull request #17004 from echo33/docker_cli_restart_test 
use of checkers on docker_cli_restart_test.go
 2015-10-15 13:31:05 +02:00
weiyan
196af472a6 use of checkers on docker_cli_restart_test.go 
Signed-off-by: weiyan <weiyan3@huawei.com>
 2015-10-15 16:35:03 +08:00
Vincent Demeester
e4dadeed88 Merge pull request #17011 from sunyuan3/TestRunWithBlkioInvalidWeight 
update TestRunWithBlkioInvalidWeight
 2015-10-15 08:34:52 +02:00
Jian Zhang
946e8cde53 Use c.Assert in integration-cli/docker_cli_logs_test.go 
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com>
 2015-10-15 10:53:19 +08:00
Vincent Demeester
aaa8cae345 Merge pull request #16968 from MHBauer/network-refactor 
refactor use of container struct from daemon
 2015-10-14 17:48:08 +02:00
weiyan
899ca94ce8 use of checkers on docker_cli_v2_only.go 
Signed-off-by: weiyan <weiyan3@huawei.com>
 2015-10-14 20:10:34 +08:00
Yuan Sun
d550fbb80e update TestRunWithBlkioInvalidWeight 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-10-14 16:20:52 +08:00
Morgan Bauer
a0398fbd19 refactor use of container struct from daemon 
- do existence check instead of get container
 - new connect method on daemon.
 - cli network disconnect integration test

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-10-13 16:34:28 -07:00
Jessica Frazelle
28ad7c588f update tests 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-13 15:52:14 -07:00
Antonio Murdaca
cfcddefacd daemon: execdriver: lxc: fix cgroup paths 
When running LXC dind (outer docker is started with native driver)
cgroup paths point to `/docker/CID` inside `/proc/self/mountinfo` but
these paths aren't mounted (root is wrong). This fix just discard the
cgroup dir from mountinfo and set it to root `/`.
This patch fixes/skip OOM LXC tests that were failing.
Fix #16520

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
 2015-10-13 14:46:59 -07:00
Antonio Murdaca
06f0d03ced daemon: execdriver: lxc: fix set memory swap 
On LXC memory swap was only set to memory_limit*2 even if a value for
memory swap was provided. This patch fix this behavior to be the same
as the native driver and set correct memory swap in the template.
Also add a test specifically for LXC but w/o adding a new test
requirement.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-10-13 14:46:59 -07:00
Alexandre Beslic
4ea3ff7061 Merge pull request #16910 from mavenugo/ipam 
Vendoring libnetwork for the pluggable IPAM driver support
 2015-10-13 14:41:19 -07:00
Vincent Demeester
ce607916e9 Merge pull request #15796 from azurezk/add-size-to-inspect 
add container size info to inspect
 2015-10-13 23:16:10 +02:00
Madhu Venugopal
cc6aece1fd IPAM API & UX 
introduced --subnet, --ip-range and --gateway options in docker network
command. Also, user can allocate driver specific ip-address if any using
the --aux-address option.
Supports multiple subnets per network and also sharing ip range
across networks if the network-driver and ipam-driver supports it.
Example, Bridge driver doesnt support sharing same ip range across
networks.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-13 11:03:03 -07:00
Madhu Venugopal
0f351ce364 Docker side changes for the newly introduced IPAM driver 
* Made use of IPAM driver primitives for legacy IP configurations
* Replaced custom Generics with backend labels

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-13 10:52:59 -07:00