e72f92cb99
Using checkers assert for integration-cli/docker_cli_export_import_test.go
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
2015-10-21 08:57:20 -04:00
7af9f988ac
Add support for multiple network in inspect
...
To be consistent with other inspect command (on container and images),
add the possiblity to pass multiple network to the network inspect
commands.
`docker network inspect host bridge none` is possible now.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-21 08:57:29 +02:00
37627427a2
Integration test for default bridge init with invalid cluster config
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-20 19:56:59 -07:00
78e2167976
Merge pull request #17202 from aboch/ipa
...
Do not mask ipam driver if no ip config is passed
2015-10-20 19:45:08 -04:00
c516aa645e
Merge pull request #17177 from runcom/bc-fixes
...
Return empty Config fields, now omitempty, for API < 1.21
2015-10-20 16:39:53 -04:00
27f908a051
Do not mask ipam driver if no ip config is passed
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-20 11:19:37 -07:00
b7fcc71a3c
Merge pull request #16917 from WeiZhang555/start-inte
...
use of checkers on `integration-cli/docker_cli_start_test.go`
2015-10-20 19:51:15 +02:00
414cfe9467
Update Dockerfile to use the correct busybox:latest identifier
...
Also requires some tests to be updated which relied on behavior
of a busybox image that wasn't actually "busybox:latest"; meaning these
tests were unable to be verified/run against a real busybox:latest image
on a daemon.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-10-20 12:03:11 -04:00
08944cdef7
use of checkers on Integration test
...
Part of #16756
Use c.Assert instead of condition judgement in
integration-cli/docker_cli_start_test.go
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-10-20 23:07:33 +08:00
aa8abf637a
Merge pull request #17196 from liaoqingwei/16756-docker_cli_info_test
...
Use of checkers on docker_cli_info_test.go
2015-10-20 10:48:20 -04:00
288214e5ae
Use of checkers on docker_cli_import_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
2015-10-20 19:58:16 +08:00
89bfbb1516
Merge pull request #17052 from echo33/docker_cli_start_volume_driver_unix_test
...
use of checkers on docker_cli_start_volume_driver_unix_test.go
2015-10-20 07:21:28 -04:00
bc478b453f
Using checkers assert for integration-cli/docker_cli_events_unix_test.go
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
2015-10-20 07:04:55 -04:00
37b3cd421f
Use of checkers on docker_cli_info_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
2015-10-20 13:38:55 +08:00
eedeeaf49c
use gocheck asserts instead of fatal
...
- for #16756
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-10-19 12:30:22 -07:00
850bc0838a
Return empty Config fields, now omitempty, for API < 1.21
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-10-19 19:09:36 +02:00
e62fd33d96
Merge pull request #17115 from mountkin/tag-on-build
...
Proposal: emit a "tag" event when building image with "-t" parameter
2015-10-19 12:35:58 -04:00
df15523745
Merge pull request #16854 from WeiZhang555/inte-test
...
use of checkers on `integration-cli/docker_cli_links_test.go` and `integration-cli/docker_cli_links_unix_test.go`
2015-10-19 12:10:31 -04:00
ae29bd435b
Fix TestInspectInt64 for run scenarios that return warnings
...
Instead of returning only the container ID, starting a container may
also return a warning:
"WARNING: Your kernel does not support swap
limit capabilities, memory limited without
swap.\nff6ebd9f7a8d035d17bb9a61eb9d3f0a5d563160cc43471a9d7ac9f71945d061"
The test assumes that only the container ID is returned and uses the
entire message as the name for the inspect command. To avoid the need to
parse the container ID from the output after the run command, give the
container a name and use that instead.
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
2015-10-19 08:56:32 -05:00
fbb01b8162
Make default tls host work
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-19 21:17:37 +08:00
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
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
2968fa44eb
emit a "tag" event when building image with "-t" parameter
...
This is useful for cluster systems such as swarm to sync the image
state when new images are successfully built.
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-10-19 20:09:14 +08:00
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
a91a874f73
use of checkers on docker_cli_start_volume_driver_unix_test.go
...
Signed-off-by: weiyan <weiyan3@huawei.com>
2015-10-19 19:19:57 +08:00
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
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
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
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
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
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
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
97b9223a1f
use of checkers on Integration test
...
Part of #16756
Use c.Assert instead of condition judgement.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-10-18 09:00:08 +08:00
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
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
0c95eeb584
rename `POST /volumes` to `POST /volumes/create` to be consistent with the other `POST /.../create` endpoints
...
see #17132
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
2015-10-17 14:13:40 +02:00
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
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
365a0db0f0
Merge pull request #17046 from mavenugo/dopts
...
driver-opts for network create
2015-10-16 15:23:59 -07:00
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
d8b4471a59
Merge pull request #16977 from mountkin/refactor-test
...
refactor integration test to use checkers
2015-10-17 00:22:03 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
e4dadeed88
Merge pull request #17011 from sunyuan3/TestRunWithBlkioInvalidWeight
...
update TestRunWithBlkioInvalidWeight
2015-10-15 08:34:52 +02:00
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
aaa8cae345
Merge pull request #16968 from MHBauer/network-refactor
...
refactor use of container struct from daemon
2015-10-14 17:48:08 +02:00
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
d550fbb80e
update TestRunWithBlkioInvalidWeight
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-10-14 16:20:52 +08:00
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
28ad7c588f
update tests
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-13 15:52:14 -07:00
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
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
4ea3ff7061
Merge pull request #16910 from mavenugo/ipam
...
Vendoring libnetwork for the pluggable IPAM driver support
2015-10-13 14:41:19 -07:00
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
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
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
0bc748bba3
Merge pull request #16956 from runcom/16665-fix-inspect-Config-api120
...
Return old Config fields for API < v1.20
2015-10-13 09:08:26 -07:00
a1d4b7dd0d
refactor integration test to use checkers
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-10-13 20:21:38 +08:00
8c63ce4f6b
Fix Config.Cpuset from API < 1.20
...
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
2015-10-13 09:09:05 +02:00
9a13c2dc79
Merge pull request #16958 from tonistiigi/digest-collision
...
Make sure tags and digests don’t collide
2015-10-12 15:45:34 -07:00
df79536769
Merge pull request #16009 from azurezk/vol-create-conflict-option
...
volume create error on conflict option
2015-10-12 15:27:36 -07:00
d08ca5c2b6
Make sure tags and digests don’t collide
...
Tags and digests are kept in the same storage. We want to make sure that they are completely separated - tags are something users set and digests can only be set by pull-by-digest code path.
Reverts #14664
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-10-12 14:20:11 -07:00
504e67b867
Calculate hash based image IDs on pull
...
Generate a hash chain involving the image configuration, layer digests,
and parent image hashes. Use the digests to compute IDs for each image
in a manifest, instead of using the remotely specified IDs.
To avoid breaking users' caches, check for images already in the graph
under old IDs, and avoid repulling an image if the version on disk under
the legacy ID ends up with the same digest that was computed from the
manifest for that image.
When a calculated ID already exists in the graph but can't be verified,
continue trying SHA256(digest) until a suitable ID is found.
"save" and "load" are not changed to use a similar scheme. "load" will
preserve the IDs present in the tar file.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-10-12 10:51:28 -07:00
b0cbc02283
Merge pull request #15503 from ibuildthecloud/revert-label
...
Revert "Container don't inherit from image labels"
2015-10-12 10:03:18 -07:00
2d1414e8b0
Merge pull request #16945 from estesp/ocd-on-nonmatching-func-names
...
Correct mismatched function names (UID() and Gid())
2015-10-12 09:15:51 -07:00
d7177c1224
Merge pull request #16900 from ZJU-SEL/16756-update-pull-local
...
update pull-local#16756
2015-10-12 17:49:10 +02:00
08c5f52d70
Merge pull request #16928 from coolljt0725/fix_16927
...
Fix docker daemon exit immediately after starting without -H option closes #16927
2015-10-12 17:24:42 +02:00
79240b9eaf
Correct mismatched function names (UID() and Gid())
...
All the go-lint work forced any existing "Uid" -> "UID", but seems to
not have the same rules for Gid, so stat package has calls UID() and
Gid().
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-10-12 10:58:33 -04:00
d5830d66e0
update test using c.Assert replace c.Fatal
...
Signed-off-by: Hao Zhang <21521210@zju.edu.cn>
2015-10-12 06:32:21 -04:00
e38767e197
Fix docker daemon exit immediately after starting without -H option closes #16927
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-12 04:49:25 -04:00
d4d0718ebf
update docker_cli_version_test.go
...
fix spelling mistake again
Signed-off-by: Mageee <fangpuyi@foxmail.com>
2015-10-12 15:13:31 +08:00
0ff3123eba
volume create error on conflict option
...
Signed-off-by: Kun Zhang <zkazure@gmail.com>
2015-10-12 11:16:39 +08:00
19c30447b5
use of checkers on Integration test
...
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
update integration-cli/docker_cli_wait_test.go
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
update integration-cli/docker_cli_wait_test.go
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
update docker_cli_wait_test.go
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
2015-10-11 11:31:01 +08:00
c6b02ad73b
Update integration test with Assert
...
Part of #16756
Update integration-cli/docker_cli_rmi_test.go:
Use Assert instead of condition judgement in test.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-10-11 10:56:02 +08:00
dc9dd188cf
update pull-local#16756
...
Signed-off-by: heartlock <21521209@zju.edu.cn>
2015-10-11 09:57:25 +08:00
ed9434c5bb
Merge pull request #12648 from estesp/userns-impl
...
Phase 1 implementation of user namespaces as a remapped container root
2015-10-10 11:38:07 -07:00
72269acf29
Use checkers on Integration test when possible
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-10-10 21:51:15 +08:00
faa448e801
Merge pull request #16838 from ZJU-SEL/update-save-load-unix-test
...
update save-load-unix-test
2015-10-10 14:51:18 +02:00
b4d6b23838
add size to inspect
...
Signed-off-by: Zhang Kun <zkazure@gmail.com>
2015-10-10 20:44:29 +08:00
8d98b37031
update save-load-unix-test
...
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn>
2015-10-10 15:16:42 +08:00
bf80adeee4
Merge pull request #16894 from diogomonica/renaming-trust-keys
...
Renaming trust keys
2015-10-09 23:20:54 -04:00
930b27a86b
fix logic because jess is the worst
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-09 22:21:24 -04:00
Mohammed Aaqib Ansari
Vincent Demeester
Madhu Venugopal
Brian Goff
Alessandro Boch
Vincent Demeester
Phil Estes
Zhang Wei
liaoqingwei
Morgan Bauer
Antonio Murdaca
Doug Davis
Christy Perez
Lei Jitang
Phil Estes
Shijiang Wei
weiyan
Antonio Murdaca
Yuan Sun
Sebastiaan van Stijn
Tobias Gesellchen
David Calavera
Tibor Vass
Zachary Jaffee
Kevin P. Kucharczyk
Zachary Jaffee
Jian Zhang
Jessica Frazelle
Antonio Murdaca
Alexandre Beslic
Antonio Murdaca
Jess Frazelle
Tonis Tiigi
Arnaud Porterie
Alexander Morozov
Hao Zhang
Mageee
Kun Zhang
Xiaoxu Chen
heartlock
Hu Keping
xlgao-zju