3d41f889fe
Minor fix of TestLogsStderrInStdout
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 2e7daffd7b3e004b5ac64ae1744e7f44252c979d
Component: engine
2015-07-21 20:37:14 +08:00
ae51c9aa8a
Add better output for TestLinksEtcHostsContentMatch to help debug #14774
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 6751a49d143e329668e4bbc3214c0bb5e4d02eeb
Component: engine
2015-07-20 16:46:51 -07:00
42d9d20733
Merge pull request #14741 from HuKeping/ci-refactor
...
CI: use dockercmd when possible
Upstream-commit: fc2f90fc63014db95fd9d9052218d72d5ca1d82c
Component: engine
2015-07-20 09:49:40 -07:00
56aba58eb4
CI: use dockercmd when possible
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 27ac154d05cf9f7aa1e9cbebe3c7769fa746de1e
Component: engine
2015-07-21 04:40:15 +08:00
f5db7bfda7
Merge pull request #14671 from hqhq/hq_use_dockerCmd
...
Use dockerCmd when possible
Upstream-commit: ee7af0d2cbefac944bcad387a1dad65cf70691aa
Component: engine
2015-07-20 09:44:42 -07:00
45b325ef2e
Merge pull request #14724 from coolljt0725/14603-dockerCmd-integration-cli-3
...
Refactor: use dockerCmd when possible in integraiton-cli tests
Upstream-commit: c6a3517246f8b94158270f68955d966f902c8ab0
Component: engine
2015-07-20 16:00:38 +02:00
da9ff50d73
Simplify swappiness check
...
As suggested in https://github.com/docker/docker/pull/14004/files#r34022527
The concern there is we can't differentiate whether user explicitly
asked for an invalid value of -1 or he did not specify anything.
I don't think this would be a problem, because:
- like all other default values like zero, we can't differentiate
user specify it or not, most of which, zeros are also invalid, so
default is default, we show these default values in help info,
so users would know if they set value as default, it'll be like
they set nothing.
- we can't do this kind of string check in REST api request, so
it'll make the behave different from docker command and RESTapi.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 6f8ddec1d0e67058c7a4a15c7d4d9a75bc1e5dea
Component: engine
2015-07-20 16:10:10 +08:00
0b00c6ae1a
dockerCmd when possible
...
Addresses: #14603
integration-cli/docker_cli_daemon_experimental_test.go (hqhq)
integration-cli/docker_cli_daemon_test.go (hqhq)
integration-cli/docker_cli_diff_test.go (hqhq)
integration-cli/docker_cli_events_test.go (hqhq)
integration-cli/docker_cli_events_unix_test.go (hqhq)
integration-cli/docker_cli_exec_test.go (hqhq)
integration-cli/docker_cli_exec_unix_test.go (hqhq)
integration-cli/docker_cli_experimental_test.go (hqhq)
integration-cli/docker_cli_export_import_test.go (hqhq)
integration-cli/docker_cli_help_test.go (hqhq)
integration-cli/docker_cli_history_test.go (hqhq)
integration-cli/docker_cli_images_test.go (hqhq)
integration-cli/docker_cli_import_test.go (hqhq)
integration-cli/docker_cli_info_test.go (hqhq)
integration-cli/docker_cli_inspect_test.go (hqhq)
integration-cli/docker_cli_kill_test.go (hqhq)
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 668e2369cc5d57d634d0e559241ea4c4cbde65d8
Component: engine
2015-07-20 14:55:40 +08:00
9e76137f40
Recfactor: Use dockerCmd when possible in integration-cli tests
...
Part of #14603
integration-cli/docker_cli_links_test.go (coolljt0725)
integration-cli/docker_cli_links_unix_test.go (coolljt0725)
integration-cli/docker_cli_logs_test.go (coolljt0725)
integration-cli/docker_cli_nat_test.go (coolljt0725)
integration-cli/docker_cli_network_test.go (coolljt0725)
integration-cli/docker_cli_stats_test.go (coolljt0725)
integration-cli/docker_cli_tag_test.go (coolljt0725)
integration-cli/docker_cli_top_test.go (coolljt0725)
integration-cli/docker_cli_version_test.go (coolljt0725)
integration-cli/docker_cli_wait_test.go (coolljt0725
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: eef6eda7d295a7577bdbe2e4630ce3350c6d7701
Component: engine
2015-07-20 14:44:22 +08:00
4c5a8b7b16
Add dockerCmdWithStdoutStderr function
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: c6cde91b7d2cb3671dc55cafc5ab693f9cb17cc8
Component: engine
2015-07-18 10:48:28 +08:00
68f2260858
Move inspect into the loop on InspectExecID test
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: f06620ece3557eb263b221e476cef2955235ba75
Component: engine
2015-07-17 17:30:24 -07:00
a752ea3772
Merge pull request #14706 from duglin/FixInspectTest
...
Fix InspectExecID test
Upstream-commit: 465192cb2885acfe71509827ff2011042e0c99b9
Component: engine
2015-07-17 14:37:23 -07:00
8a425b30fb
Merge pull request #14693 from LK4D4/update_libcontainer
...
Update libcontainer
Upstream-commit: 98ed9a55f42f7c86c7c9cddb27f6807e7e77c889
Component: engine
2015-07-17 13:02:04 -07:00
4daf251bed
Merge pull request #13951 from calavera/plugins_path
...
Separate plugin sockets and specs.
Upstream-commit: a763637eae7dcf5d870e9d035be5baf94d72e2c5
Component: engine
2015-07-17 21:11:31 +02:00
7744d0b3be
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 >
Upstream-commit: c5c98c31a184837c7f5b1f43d8ef18a676a8bf30
Component: engine
2015-07-17 06:46:37 -07:00
63609ba888
Merge pull request #14698 from duglin/AddErr
...
Add missing 'err' to Fatalf to help debug an issue
Upstream-commit: ac3f7c71b8e82b5faf014b13138219723f6a0c67
Component: engine
2015-07-16 21:42:42 -07:00
d7c4893fc7
Add missing 'err' to Fatalf to help debug an issue
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 97c5f64001af1ac6c9035af672e45051cab55f62
Component: engine
2015-07-16 20:27:14 -07:00
8c0a231700
Merge pull request #14578 from mountkin/fix-rmi-image-not-found
...
don't allow deleting the image of running containers
Upstream-commit: 15cb7dfc9ecb4600fc514ceef478f8b8ea631b36
Component: engine
2015-07-16 18:02:51 -07:00
d9e652a366
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 >
Upstream-commit: c86189d554ba14aa04b6314970d3699e5ddbf4de
Component: engine
2015-07-16 16:02:26 -07:00
12460b884d
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 >
Upstream-commit: 6c0795747b00589641eb34eb7adce05a56d8840f
Component: engine
2015-07-16 14:20:07 -07:00
1492d5ce64
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 >
Upstream-commit: 19515a7ad859b28c474d81e756ac245afcd968e3
Component: engine
2015-07-16 13:13:47 -04:00
f429ebce66
Refactor : Use dockerCmd in integration-cli tests
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 71868228c787f54501abec6556364d2ceaa4e645
Component: engine
2015-07-17 04:07:12 +08:00
fa4cacc2ff
don't allow deleting the image of running containers
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: ce6410cd4ccdf3b0d2b9a1bdd0166d4989a88300
Component: engine
2015-07-16 13:14:48 +08:00
28d39d6dba
Merge pull request #14624 from vdemeester/14603-dockerCmd-integration-cli-1
...
Integration test refactors to use dockerCmd
Upstream-commit: e98a8815704c4c4007d45a88f88ab6a45959066e
Component: engine
2015-07-15 14:03:58 -04:00
abe73960d5
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 >
Upstream-commit: 5c295460da2098d971eda28a73b416ff6be62f53
Component: engine
2015-07-14 21:52:43 +02:00
a95d0e254d
Add dockerCmdWithError
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 4290bdefabc46d6faada968ef7ddba1d3c21dcca
Component: engine
2015-07-14 08:35:06 +02:00
4c94e1cdab
Merge pull request #10717 from mrunalp/feature/group_add
...
Adds support for specifying additional groups.
Upstream-commit: 35b02239216d7c976d4b07022429fec25ff9669d
Component: engine
2015-07-13 17:08:05 -07:00
6b6bb1a8e9
Adds test for additional groups.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: 0b7938e8459eda3b80bcc581837e90edc4d6855f
Component: engine
2015-07-13 14:47:28 -04:00
f4541a8bb5
Cleanup not needed calls to deleteImages
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: d3566fa0b1130fb938ad55da69fee2b7790dc3cf
Component: engine
2015-07-13 20:30:53 +02:00
4d4c7231d9
Merge pull request #14500 from runcom/add-diff-emtpy-arg-test
...
Add diff command with emtpy string testcase
Upstream-commit: 0f466c36b9dcf12eafb7968b896b6f5027df3231
Component: engine
2015-07-13 11:30:31 -06:00
838d3d706b
Merge pull request #14586 from Tenk42/14362-Improve-sockRequestRaw-check
...
Improve sockRequest and sockRequestRaw check
Upstream-commit: 1f963af697e8df3a78217f6fdbf67b8123a7db94
Component: engine
2015-07-13 15:59:39 +02:00
eaf197ed98
Merge pull request #14004 from ktraghavendra/13938_container_swappiness
...
Add the memory swappiness tuning option to docker.
Upstream-commit: 441ae6c94398dc52a8e6918296b15e6d5b3b4b8e
Component: engine
2015-07-13 09:22:08 -04:00
cc86945735
Improve sockRequest and sockRequestRaw check
...
Signed-off-by: Quentin Tayssier <qtayssier@gmail.com >
Upstream-commit: fa6925aa9b3aad37e93bc38602bb665b4a2badf9
Component: engine
2015-07-13 21:49:08 +09:00
b57d4c713b
Add minor vet fixes
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 26ce3f4c90058a2b2f23a2cb36492cfa7963494c
Component: engine
2015-07-12 19:16:38 +02:00
11e2c4a554
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 >
Upstream-commit: 921da495d24695dda66d3f58e78887dd0bc2402e
Component: engine
2015-07-12 13:16:33 +05:30
9f9bda0c57
Merge pull request #13669 from ewindisch/readonly-proc
...
Make /proc, /sys, & /dev readonly for readonly containers
Upstream-commit: 703248da20566f707b8290662805a9264629e2e0
Component: engine
2015-07-10 15:32:13 -07:00
5b7992c914
Merge pull request #12856 from duglin/ConfigLocation
...
Add support for DOCKER_CONFIG/--config to specify config file dir
Upstream-commit: 5bf98dd997bbc4db2a70594669457417498212bd
Component: engine
2015-07-10 23:05:49 +02:00
3e1377983b
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 >
Upstream-commit: daced1d30345aca06857f874dfb48b7e90cb409b
Component: engine
2015-07-10 12:51:34 -07:00
3a1c206f9b
Merge pull request #14306 from Microsoft/validatepsfilter
...
Validate status= filter to docker ps
Upstream-commit: 20ac0e61643ec185052b8f29272aba1e95be76ec
Component: engine
2015-07-10 15:43:01 -04:00
2371d5e9ce
Merge pull request #13312 from hqhq/hq_enable_cgroupfs
...
Add cgroup bind mount by default
Upstream-commit: 1dd2fda394923ab6c64d58d7d3b91043f16b72c2
Component: engine
2015-07-10 10:45:05 -07:00
e5af478260
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 >
Upstream-commit: 72b75cd4e764e25cecd3f0c100597b8868c68120
Component: engine
2015-07-10 07:27:11 -07:00
b0c29eba8b
Minor fix to the exec inspect test
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 899c85b40538ff75aa5c8b8f92dff55e3bff0d0b
Component: engine
2015-07-10 06:19:03 -07:00
c770b13f1f
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 >
Upstream-commit: f18fb5b3efd59d54c00d4e1b1d4b88c4b21e96be
Component: engine
2015-07-10 13:12:09 +08:00
aae04e2dff
Merge pull request #14514 from hqhq/hq_fix_file_leak
...
Fix file leak in integration-cli
Upstream-commit: 6e64e0548f30fd9d1a368ac5ea5bde9dec38c162
Component: engine
2015-07-09 21:52:59 -04:00
0f6e3890ae
Merge pull request #14480 from Microsoft/fix-windows-ci
...
Fix Windows CI fail due to GH13866
Upstream-commit: 56e8a99b617588f6fce5b8a311fa7d01db67c7e6
Component: engine
2015-07-09 16:37:41 -07:00
f35886e35f
Port POST container attach tests
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
Upstream-commit: a8715ea2207966e649e66a4fafcf34517234061f
Component: engine
2015-07-09 12:52:45 -07:00
448d2ef599
Fix Windows CI fail due to GH13866 and patch up tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c1b524486c80932f0c97b935f1ff9e41d30eab4e
Component: engine
2015-07-09 10:09:45 -07:00
32f581b90b
Add diff command with emtpy string testcase
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 9d84d4c2ccf92aa87d82ff82aedd177950951dbf
Component: engine
2015-07-09 18:46:38 +02:00
10798d6350
Merge pull request #14498 from calavera/fix_volume_from_references
...
Fix volumes-from mount references.
Upstream-commit: 37771c122b3d1cf1e68ef2887586361e48792fef
Component: engine
2015-07-09 12:34:27 -04:00
f6f9fbadc6
Merge pull request #14348 from sunyuan3/TestPullImageWithAllTagFromCentralRegistry
...
Add TestPullImageWithAllTagFromCentralRegistry test case.
Upstream-commit: 5369b6cf29aafce9f335e8ab77a41575ac66ad5f
Component: engine
2015-07-09 09:56:53 -06:00
