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

2255 commits

Author SHA1 Message Date
Alessandro Boch
20faaaa872 Turn off service discovery when icc==false 
- Turn off built-in service discovery on docker0 bridge
  when icc is false

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-10-22 12:02:02 -07:00
John Howard
a7e686a779 Windows: Add volume support 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-22 10:42:53 -07:00
Vincent Demeester
48fe12af0c Merge pull request #16784 from MHBauer/test-refactor 
use gocheck asserts instead of fatal
 2015-10-22 08:34:50 +02:00
Hu Keping
710817a71b Use checker on integration test when possible 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-10-22 15:53:17 +08:00
Jess Frazelle
bf8ba3d0c9 Merge pull request #16908 from brahmaroutu/skip_oom_gccgo 
Skipping two tests when running with GCCGO (CI)
 2015-10-21 14:01:59 -07:00
Tibor Vass
56ef47e881 Merge pull request #16890 from runcom/perf-boost 
rmi and build cache miss performance improvements
 2015-10-21 16:00:25 -04:00
Sebastiaan van Stijn
9f031f70ce Merge pull request #17218 from vdemeester/17023-network-multiple-inspect 
Add support for multiple network in inspect
 2015-10-21 11:09:02 -07:00
Tibor Vass
6a7c38a57d Merge pull request #16940 from coolljt0725/default_tls_host 
Make default tls host work
 2015-10-21 14:02:22 -04:00
Srini Brahmaroutu
dc813c7d13 Skipping two tests when running with GCCGO (CI) 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-10-21 17:53:59 +00:00
Sebastiaan van Stijn
492945235b Merge pull request #17136 from gesellix/change-route-volume-create 
rename `POST /volumes` to `POST /volumes/create`
 2015-10-21 10:21:27 -07:00
Tibor Vass
bb5551746b Merge pull request #17229 from mavenugo/ds_fix 
Fixing bootup inconsistencies due to invalid cluster-store config
 2015-10-21 12:00:07 -04:00
Antonio Murdaca
f6577be1c9 graph: ensure _tmp dir is always removed 
Also remove unused func `newTempFile` and prevent a possible deadlock
between pull_v2 `attemptIDReuse` and graph `register`

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-10-21 17:13:45 +02:00
Antonio Murdaca
56f5e3459f graph: add parent img refcount for faster rmi 
also fix a typo in pkg/truncindex package comment

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-10-21 17:13:45 +02:00
Antonio Murdaca
04ef69a1e9 integration-cli: docker_cli_build_test: check error before defer 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-10-21 17:13:45 +02:00
Mohammed Aaqib Ansari
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
Vincent Demeester
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
Madhu Venugopal
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
Brian Goff
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
Brian Goff
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
Alessandro Boch
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
Vincent Demeester
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
Phil Estes
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
Zhang Wei
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
Brian Goff
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
Brian Goff
9f19cbc2c4 Fix bug in volume driver test implementation 
Also cleans up some of the driver handlers and converts this to use
checkers everywhere.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-10-20 09:17:49 -04:00
liaoqingwei
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
Brian Goff
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
Mohammed Aaqib Ansari
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
liaoqingwei
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
Morgan Bauer
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
Antonio Murdaca
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
Doug Davis
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
Brian Goff
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
Christy Perez
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
Lei Jitang
fbb01b8162 Make default tls host work 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-10-19 21:17:37 +08:00
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
Shijiang Wei
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
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
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
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
Zhang Wei
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
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
Tobias Gesellchen
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
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
Tibor Vass
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
Shijiang Wei
a1d4b7dd0d refactor integration test to use checkers 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2015-10-13 20:21:38 +08:00
Antonio Murdaca
8c63ce4f6b Fix Config.Cpuset from API < 1.20 
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
 2015-10-13 09:09:05 +02:00
Tibor Vass
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
Jess Frazelle
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
Tonis Tiigi
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
Tonis Tiigi
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
Arnaud Porterie
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
Alexander Morozov
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
Antonio Murdaca
d7177c1224 Merge pull request #16900 from ZJU-SEL/16756-update-pull-local 
update pull-local#16756
 2015-10-12 17:49:10 +02:00
Antonio Murdaca
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
Phil Estes
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
Hao Zhang
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
Lei Jitang
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
Mageee
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
Xiaoxu Chen
a9c7c48cca update integration-cli/docker_cli_netmode_test.go 
part of #16756

Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>

refactor integration-cli/docker_cli_netmode_test.go use Assert statement
part of #16756

Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>

update  integration-cli/docker_cli_netmode_test.go
part of #16756

Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>

update docker_cli_netmode_test.go
part of #16756

Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>

update integration-cli/docker_cli_netmode_test.go
part of #16756

Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>

update integration-cli/docker_cli_netmode_test.go
part of #16756

Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>

update integration-cli/docker_cli_netmode_test.go
part of #16756

Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>

update  integration-cli/docker_cli_netmode_test.go
part of #16756

Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
 2015-10-12 13:34:43 +08:00
Kun Zhang
0ff3123eba volume create error on conflict option 
Signed-off-by: Kun Zhang <zkazure@gmail.com>
 2015-10-12 11:16:39 +08:00
Xiaoxu Chen
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
Zhang Wei
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
heartlock
dc9dd188cf update pull-local#16756 
Signed-off-by: heartlock <21521209@zju.edu.cn>
 2015-10-11 09:57:25 +08:00
Arnaud Porterie
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
Hu Keping
72269acf29 Use checkers on Integration test when possible 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-10-10 21:51:15 +08:00
Vincent Demeester
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
Zhang Kun
b4d6b23838 add size to inspect 
Signed-off-by: Zhang Kun <zkazure@gmail.com>
 2015-10-10 20:44:29 +08:00
xlgao-zju
8d98b37031 update save-load-unix-test 
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn>
 2015-10-10 15:16:42 +08:00
Phil Estes
bf80adeee4 Merge pull request #16894 from diogomonica/renaming-trust-keys 
Renaming trust keys
 2015-10-09 23:20:54 -04:00
Jessica Frazelle
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
Phil Estes
a85e6a4d4a Update integration test userns support with flag name change 
`--root` is now `--userns-remap`

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-10-09 20:52:45 -04:00
Jessica Frazelle
ea3afdad61 add test-integration-cli specifics for userns 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-09 20:50:27 -04:00
Phil Estes
44e1023a93 Add user namespace enable flag --userns-remap in experimental build 
This adds the capability to turn on user namespace support when using an
experimental build Docker daemon binary using the `--userns-remap` flag.

Also documentation is added to the experimental docs.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-10-09 20:50:05 -04:00
Diogo Monica
d9a2fadb5e Changing docs to reflect new names 
Signed-off-by: Diogo Monica <diogo@docker.com>
 2015-10-09 15:13:37 -07:00
Vincent Demeester
1e5165275f Merge pull request #16858 from cxxly/16756-refactor-docker_cli_login_test 
refactor integration-cli/docker_cli_login_test.go with Assert
 2015-10-09 23:56:24 +02:00
Phil Estes
442b45628e Add user namespace (mapping) support to the Docker engine 
Adds support for the daemon to handle user namespace maps as a
per-daemon setting.

Support for handling uid/gid mapping is added to the builder,
archive/unarchive packages and functions, all graphdrivers (except
Windows), and the test suite is updated to handle user namespace daemon
rootgraph changes.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-10-09 17:47:37 -04:00
Diogo Monica
63f8db83aa Adding tests for backwards compatibility 
Signed-off-by: Diogo Monica <diogo@docker.com>
 2015-10-09 12:20:19 -07:00
Alexander Morozov
2491f6c95a Merge pull request #16877 from cxxly/16756-refactor-docker_hub_pull_suite_test 
Use Assert statement to replace condition judgment
 2015-10-09 09:57:14 -07:00
Alexander Morozov
a77d80d9d1 Merge pull request #16881 from cxxly/16756-refactor-docker_cli_stats_test 
update integration-cli/docker_cli_stats_test.go use Assert statement
 2015-10-09 09:55:41 -07:00
Phil Estes
c2df663851 Merge pull request #16843 from ZJU-SEL/16756-fix-rename-test 
#16756 update rename test
 2015-10-09 11:23:46 -04:00
Vincent Demeester
19ff8e09ba Merge pull request #16870 from cxxly/16756-refactor-docker_cli_proxy_test 
refactor docker_cli_proxy_test.go
 2015-10-09 15:43:39 +02:00
Hao Zhang
22d0be5797 use gocheck asserts instead of fatal 
Signed-off-by: Hao Zhang <21521210@zju.edu.cn>
 2015-10-09 08:34:02 -04:00
Xiaoxu Chen
90a81f6af2 update integration-cli/docker_cli_stats_test.go use Assert statement 
part of #16756

Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
 2015-10-09 18:24:32 +08:00
Xiaoxu Chen
ee7fdbe8b9 Use Assert statement to replace condition judgment 
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
 2015-10-09 17:45:28 +08:00
Xiaoxu Chen
75bc0c064b update docker_cli_login_test.go 
part of #16756

Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
 2015-10-09 15:08:01 +08:00
Xiaoxu Chen
1db161768c update docker_cli_proxy_test.go 
Part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
 2015-10-09 14:53:56 +08:00
Xiaoxu Chen
14f43406a3 refactor docker_cli_proxy_test.go 
part of #16756

Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
 2015-10-09 11:11:05 +08:00
Arnaud Porterie
e7ef8633d5 Merge pull request #16862 from cpuguy83/bump_runc 
Bump runc
 2015-10-08 19:09:47 -07:00
Jess Frazelle
a1d432301d Merge pull request #16859 from diogomonica/changing-trust-server-checks 
Changing trustServer allowed URL validation
 2015-10-08 18:33:35 -07:00
Diogo Monica
a2f9fb7777 Changing trustServer allowed URL behavior 
Signed-off-by: Diogo Monica <diogo@docker.com>
 2015-10-08 17:47:25 -07:00
Brian Goff
a705ca0173 Fix exp tests cast protodriver to naivediffdriver 
A recent change made `graphdriver.NaiveDiffDriver` from a function to a
struct. New function is `graphdriver.NewNaiveDiffDriver.

The graphdriver plugin PR was created (and tests run) before this change
was introduced causing the failure to not be seen until after merge.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-10-08 19:44:50 -04:00
Brian Goff
d9f5f1954c Bump runc 
Fixes a race when starting a container when there is an error, the stdio
streams are not always written.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-10-08 17:07:00 -04:00
Jess Frazelle
01cd67e752 Merge pull request #16366 from MHBauer/logs-refactor 
refactor logs to not use internal data structures
 2015-10-08 14:05:02 -07:00
Jess Frazelle
4c55464dd3 Merge pull request #13777 from cpuguy83/graphdriver_extpoints 
Create extpoint for graphdrivers
 2015-10-08 13:46:42 -07:00
Jess Frazelle
9123f77a78 Merge pull request #16817 from cpuguy83/explicit_volume_ls 
Make `docker volume` behave like `docker network`
 2015-10-08 11:36:51 -07:00
Jess Frazelle
41c99cc621 Merge pull request #15693 from vdemeester/15659-image-label-filter 
Fix #15659 : filter by label for docker images commited
 2015-10-08 11:14:51 -07:00
Vincent Demeester
683ee20562 Merge pull request #16669 from sunyuan3/TestRunInValidCPUShares 
add TestRunInValidCPUShares
 2015-10-08 19:38:21 +02:00
Xiaoxu Chen
79498b1c61 refactor integration-cli/docker_cli_login_test.go with Assert 
part of #16756

Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
 2015-10-08 12:43:03 -04:00
Jess Frazelle
2b6af905fa Merge pull request #16815 from duglin/fixHelp 
Fix help test comment to align with the code
 2015-10-08 09:29:32 -07:00
Alexander Morozov
4a9d039721 Merge pull request #16783 from Microsoft/10662-cliwait 
Windows CI: cli_wait_test
 2015-10-07 19:39:32 -07:00
Yuan Sun
042d08a2a8 add TestRunInValidCPUShares 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-10-08 10:04:51 +08:00
Morgan Bauer
1eecc1e7e5
refactor logs to not use internal data structures 
- refactor to make it easier to split the api in the future
 - additional tests for non existent container case

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-10-07 15:44:16 -07:00
John Howard
e666dfff9b Windows CI: Fix cli_wait_test 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-07 12:57:41 -07:00
Arnaud Porterie
8e31036816 Merge pull request #16645 from mavenugo/ux 
Docker Network UX & remote API changes
 2015-10-07 10:44:58 -07:00