9688b9f21e
Merge pull request #17166 from echo33/docker_cli_diff_test
...
use of checkers on docker_cli_diff_test.go
Upstream-commit: 1f9557ac66740fa4c722f0d80e2d8e00b0ca6b5f
Component: engine
2015-10-19 08:25:32 -04:00
eb8940de3d
Merge pull request #17167 from liaoqingwei/16756-docker_cli_inspect_experimental_test.go
...
Use of checkers on docker_cli_inspect_experimental_test.go
Upstream-commit: 1c783567c06e52288bbff73168ee3596e2d357e7
Component: engine
2015-10-19 08:21:17 -04:00
07d916aab1
Use of checkers on docker_cli_inspect_experimental_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
Upstream-commit: f3b2b8700f63654ff5c361dedfcf539eb6ee9ef6
Component: engine
2015-10-19 19:44:04 +08:00
0b8125559d
use of checkers on docker_cli_diff_test.go
...
Signed-off-by: weiyan <weiyan3@huawei.com >
Upstream-commit: 7be79767c18a1643e9e8e9be1764f2c838152c0b
Component: engine
2015-10-19 19:07:59 +08:00
8f92947edf
Merge pull request #16897 from sunyuan3/docker_cli_rm_test
...
use of checkers on docker_cli_rm_test.go
Upstream-commit: eaa1fc41c6cbdf589831d607e86e0ee38c2d053f
Component: engine
2015-10-19 09:14:23 +02:00
a835b763db
Merge pull request #17162 from echo33/docker_cli_exec_unix_test
...
use of checkers on docker_cli_exec_unix_test.go
Upstream-commit: cfdb954303d031b85847483765b2ca98fc8d3f79
Component: engine
2015-10-19 08:54:42 +02:00
e8502d163c
use of checkers on docker_cli_exec_unix_test.go
...
Signed-off-by: weiyan <weiyan3@huawei.com >
Upstream-commit: d65ac42ca8ca368e0e6dc5ec9a26f8ec13b98ef4
Component: engine
2015-10-19 15:14:59 +08:00
91f3592865
use of checkers on docker_cli_rm_test.go
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 0780ddc498f093cec67edd358e00add82c5efd5a
Component: engine
2015-10-19 10:42:56 +08:00
a455baadf1
Merge pull request #17008 from liaoqingwei/dev1
...
Update testcases: use of checkers on docker_cli_nat_test.go
Upstream-commit: bece5b82a89081816bc622d3c3e9178251013636
Component: engine
2015-10-18 18:11:02 +02:00
f9537ab059
Use of checkers on docker_cli_nat_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
Upstream-commit: 26ae6d6b36a40a42706e149a6d1c30c27b5b3355
Component: engine
2015-10-18 20:02:55 +08:00
c93afd4f9e
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
Upstream-commit: cffd50752c2b2243519193a4ca458156291eb8af
Component: engine
2015-10-17 08:50:51 -07:00
0c3c684555
Use checker assert for docker_api_build_test.go
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 253f975fdbc13bc8a84fba1a3f8a4e518cb86d8e
Component: engine
2015-10-17 14:28:13 +02:00
17e4fec1fd
Merge pull request #16871 from ZJU-SEL/fix_version_test
...
update docker_cli_version_test.go
Upstream-commit: 9b1fb0d45b09f72e368e4f5d025ea592ee002007
Component: engine
2015-10-17 08:02:18 -04:00
2c49af742a
Merge pull request #17113 from mountkin/validate-filter
...
make sure the value of the dangling filter is correct
Upstream-commit: c3f42b29a805e41a1e518653a1855c4e2a7f8d43
Component: engine
2015-10-16 16:32:11 -07:00
f246159061
Merge pull request #17046 from mavenugo/dopts
...
driver-opts for network create
Upstream-commit: 365a0db0f0f105306a8553405fb68a207e8d7754
Component: engine
2015-10-16 15:23:59 -07:00
a13a9840ca
Merge pull request #16901 from WeiZhang555/rmi-inte
...
Update integration test `integration-cli/docker_cli_rmi_test.go` with Assert
Upstream-commit: ec7c368ff01e2e79cb26a5afa2d2c7291cc1472d
Component: engine
2015-10-16 15:23:00 -07:00
08f3a405bd
Merge pull request #16977 from mountkin/refactor-test
...
refactor integration test to use checkers
Upstream-commit: d8b4471a593f55a06ec77e6b3e8215a20b3f0f5f
Component: engine
2015-10-17 00:22:03 +02:00
56234a9ec7
Merge pull request #17065 from ZJaffee/api-exec-resize-test
...
cleaned up integration-cli/docker_api_exec_resize_test.go
Upstream-commit: 258357857bc0bc184370e50cba6d20d5ec373666
Component: engine
2015-10-16 14:59:06 -07:00
08be0c3eb3
Pass network driver option in docker network command
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 6f3eb994b52dac9e336db9fe9f204e120553e8a7
Component: engine
2015-10-16 14:33:54 -07:00
60b4592b43
Merge pull request #17081 from ZJaffee/api_network_test
...
Cleaned up integration-cli/docker_api_network_test.go
Upstream-commit: c56b02b284b6f5b1d59750a5fd087601d8919ecb
Component: engine
2015-10-16 23:14:17 +02:00
2c094cc2e5
Merge pull request #16969 from zhangjianfnst/16756-improve-integration-cli
...
Use c.Assert in integration-cli/docker_cli_logs_test.go
Upstream-commit: 84be89a273742b24bb9a87ea5ccfecac97d33bfc
Component: engine
2015-10-16 16:55:44 -04:00
58fe4023e8
cleaned up integration-cli/docker_api_exec_resize_test.go
...
Signed-off-by: Zachary Jaffee <zij@case.edu >
Upstream-commit: 7b6bca5af1b8eb4f6fc99db6670a9f528284cb20
Component: engine
2015-10-16 13:22:40 -04:00
6bb352bab1
Merge pull request #17100 from WeiZhang555/port-inte
...
update docker_cli_port_test.go with Assert
Upstream-commit: 2afdab4454679650669b3bb70321568d25de9dd8
Component: engine
2015-10-16 19:06:14 +02:00
87dbf43805
Merge pull request #17105 from liaoqingwei/dev3
...
Use of checkers on docker_cli_pause_test.go.
Upstream-commit: 71982d8e576e659010426b94ba2c9fcfcb3e91c6
Component: engine
2015-10-16 17:36:56 +02:00
17fc3c7655
Merge pull request #17078 from kevinkucharczyk/api_version_test
...
Clean up integration-cli/docker_api_version_test.go
Upstream-commit: f9026e2b7b6431019f1a875e26174881f4275754
Component: engine
2015-10-16 08:26:53 -07:00
2f2d8462ab
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 >
Upstream-commit: 1ae4eeb8136485e78b54de269c70a995fbaab9dd
Component: engine
2015-10-16 22:58:51 +08:00
5845714a6c
make sure the value of the dangling filter is correct
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 98c1a412b4102deb3ff58dd035447dc5a9d23ce3
Component: engine
2015-10-16 22:09:32 +08:00
9cdb750bf4
Merge pull request #17053 from liaoqingwei/dev2
...
use of checkers on docker_cli_network_unix_test.go
Upstream-commit: 835fbee9a23300569f95092c60fbc00eedddb6c5
Component: engine
2015-10-16 09:36:59 -04:00
01a3690b02
Use of checkers on docker_cli_pause_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
Upstream-commit: 851a533a823f1d158733e94afd4076c6a75f9706
Component: engine
2015-10-16 21:07:02 +08:00
2ebbc9e095
Use of checkers on docker_cli_network_unix_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
Upstream-commit: 9e3db08363fa85a08d7e6f9aa5059d19291c83c0
Component: engine
2015-10-16 16:56:40 +08:00
1c1b8094f5
Clean up integration-cli/docker_api_version_test.go
...
Signed-off-by: Kevin P. Kucharczyk <kevinkucharczyk@gmail.com >
Upstream-commit: 6f1b5946b13e617ab18c5325aac4859620045425
Component: engine
2015-10-16 07:03:39 +02:00
d58c97726f
Merge pull request #17073 from ZJaffee/api_events_test
...
Cleaned up integration-cli/docker_api_events_test.go
Upstream-commit: 1052ff674cf41b175ce5ec764b489ff843675dbf
Component: engine
2015-10-16 00:22:29 +02:00
0d26194398
Cleaned up integration-cli/docker_api_network_test.go
...
Signed-off-by: Zachary Jaffee <zij@case.edu >
Upstream-commit: 7345050e4d5d360a7d808e8dd74f879bd12ebe99
Component: engine
2015-10-15 13:37:54 -04:00
8971270851
Cleaned up integration-cli/docker_api_logs_test.go
...
Signed-off-by: Zachary Jaffee <zij@case.edu >
Upstream-commit: 7aab43e8d4e71ea056d635c5659d32f2efbb3a3f
Component: engine
2015-10-15 13:33:31 -04:00
0794c030b2
Cleaned up integration-cli/docker_api_events_test.go
...
Signed-off-by: Zachary Jaffee <zij@case.edu >
Upstream-commit: 176d8c5a144a961b2d6590ae70279d3fc6e3ef31
Component: engine
2015-10-15 12:40:36 -04:00
7cb16e93cd
Merge pull request #17004 from echo33/docker_cli_restart_test
...
use of checkers on docker_cli_restart_test.go
Upstream-commit: 0f00c36d65101791c862d9cac0793336787c1667
Component: engine
2015-10-15 13:31:05 +02:00
cce8b7e14d
use of checkers on docker_cli_restart_test.go
...
Signed-off-by: weiyan <weiyan3@huawei.com >
Upstream-commit: 196af472a6b423ed0547c0fb080aa548cd077efd
Component: engine
2015-10-15 16:35:03 +08:00
d7e9503657
Merge pull request #17011 from sunyuan3/TestRunWithBlkioInvalidWeight
...
update TestRunWithBlkioInvalidWeight
Upstream-commit: e4dadeed8860dbe748e7257ea13c792a8d82073b
Component: engine
2015-10-15 08:34:52 +02:00
e8859795ce
Use c.Assert in integration-cli/docker_cli_logs_test.go
...
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com >
Upstream-commit: 946e8cde53734c702b7828e2a0bff1d3229e71e1
Component: engine
2015-10-15 10:53:19 +08:00
9be0d4300b
Merge pull request #16968 from MHBauer/network-refactor
...
refactor use of container struct from daemon
Upstream-commit: aaa8cae34537eb9bddacacc8bce61c91ca76d7d2
Component: engine
2015-10-14 17:48:08 +02:00
06e65682ca
use of checkers on docker_cli_v2_only.go
...
Signed-off-by: weiyan <weiyan3@huawei.com >
Upstream-commit: 899ca94ce8d78229195213d1558917eb98cbc7de
Component: engine
2015-10-14 20:10:34 +08:00
e864e1b06f
update TestRunWithBlkioInvalidWeight
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: d550fbb80e0ecf4b10c14e8b06bc8606101696dd
Component: engine
2015-10-14 16:20:52 +08:00
182a4806ba
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 >
Upstream-commit: a0398fbd197b5c4cf261b702ba1a1f924d6134e8
Component: engine
2015-10-13 16:34:28 -07:00
332d97bdef
update tests
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 28ad7c588f5ebaf5a41950b42a61759cf47c8de7
Component: engine
2015-10-13 15:52:14 -07:00
50f40c819d
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 >
Upstream-commit: cfcddefacd125af4d909df653bccc8e3089a03b0
Component: engine
2015-10-13 14:46:59 -07:00
1a998995c2
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 >
Upstream-commit: 06f0d03cede5f6cdaca87f6b786555b023d5286f
Component: engine
2015-10-13 14:46:59 -07:00
0e3861a2d2
Merge pull request #16910 from mavenugo/ipam
...
Vendoring libnetwork for the pluggable IPAM driver support
Upstream-commit: 4ea3ff70618d28520d2ae787bd00206d05c9f1db
Component: engine
2015-10-13 14:41:19 -07:00
019ffb819f
Merge pull request #15796 from azurezk/add-size-to-inspect
...
add container size info to inspect
Upstream-commit: ce607916e9b4e294e66188bbaf50acaa86e3909f
Component: engine
2015-10-13 23:16:10 +02:00
7a285e518e
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 >
Upstream-commit: cc6aece1fdefbc10638fe9e462a15608c6093115
Component: engine
2015-10-13 11:03:03 -07:00
2cd0b95af5
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 >
Upstream-commit: 0f351ce3643a97d4b6af0021826b851f9ba41967
Component: engine
2015-10-13 10:52:59 -07:00
