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
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
81d1e83005
Fix volumes-from mount references.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3d029c3bf335bc2867d1efc803096d2912b81799
Component: engine
2015-07-09 09:01:57 -06:00
9c6eed3d0d
Fix file leak in integration-cli
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: d28b0ba115f44f7a49cfc442d5eff146e57c3167
Component: engine
2015-07-09 18:52:18 +08:00
4fadb58803
Remove prefix dots from inspects in tests
...
Dots prepended to key in inspectField function
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 67058e388b596392f7aceb7ecd6b38f6f2ff2de1
Component: engine
2015-07-08 12:41:05 -07:00
f310d0a0b6
Add TestPullImageWithAllTagFromCentralRegistry test case.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: c9a4c1401fc79d6cdee222a2b82cdb8379402552
Component: engine
2015-07-08 19:47:33 +08:00
13ea01e391
Fix copy from a "created" container. Fixes #14420
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 289ee90b04a2315cd36d6ff363b41c89f8ebf2aa
Component: engine
2015-07-08 11:15:09 +08:00
38036b2494
Merge pull request #14388 from runcom/14316-fix-events-filters
...
Fix combined image events filters
Upstream-commit: 2cd417df7378e52c05569fa4340f5126d03fbaa8
Component: engine
2015-07-07 18:08:56 -07:00
237be75b88
Merge pull request #13866 from brahmaroutu/runOOM_13766
...
RunOOM test should check to see if Oom Control is enabled
Upstream-commit: a5283d2ff3546c1fe946aa8a1ddc076b08d5700c
Component: engine
2015-07-07 16:21:46 -07:00
4c7faac4a7
Merge pull request #14380 from sunyuan3/TestRunCapAddCHOWN
...
add TestRunCapAddCHOWN test case
Upstream-commit: e3966c103123ca2162ccf3ea8b463367ab55cb31
Component: engine
2015-07-07 12:36:14 -07:00
6127908005
Merge pull request #14375 from coolljt0725/fix_test_events_default_empty
...
Fix test TestEventsDefaultEmpty. Fixes #14360
Upstream-commit: 10bbf62081ac85b17a93d79ba43eec43bebe468c
Component: engine
2015-07-07 10:37:40 -04:00
1d7351e687
Merge pull request #14428 from sunyuan3/TestPushBusyboxImage
...
Correct wrong comment of TestPushBusyboxImage.
Upstream-commit: 61418e39d534fcd4cf13d5559133da6d0834feb0
Component: engine
2015-07-07 14:44:08 +02:00
13acfe3c90
Correct wrong comment of TestPushBusyboxImage.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: f244ed2531721ec8b3240d1ec8e2bd9f9acf466c
Component: engine
2015-07-07 16:10:37 +08:00
5bdb87278d
Fix test TestEventsDefaultEmpty. Fixes #14360
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 28028312183126102b8eb260b7112cc37dd5aca9
Component: engine
2015-07-07 11:27:00 +08:00
7570a24c80
RunOOM test should check to see if Oom Control is enabled
...
closes #13766
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: e7fb38410dfcbdd83df7c9e16806bbf8fc3af8b5
Component: engine
2015-07-06 21:15:55 +00:00
7c1cdd2da7
Fix integration tests with testRequires(c, Network)
...
It seems http://hub.docker.com is not accessible anymore, so switching
to https://hub.docker.com for testRequires(c, Network).
Adds a Timeout check on the TestRequirement to *panic* if there is a
timeout (fail fast).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6e4c6da81916e25081c32d3e5f8880ef4d03ad36
Component: engine
2015-07-06 22:08:35 +02:00
0504497d15
Fix combined image events filters
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 19e6de26541a01155019ef715359393412bedcde
Component: engine
2015-07-04 00:19:08 +02:00
be54d1050e
add TestRunCapAddCHOWN test case
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 230179c8dc120b4b1a181e24de055bdca7963491
Component: engine
2015-07-03 23:25:52 +08:00
08ad652976
api/server: Add missing json check
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 801a7fed19643b7b89929daf53b37e0630e05586
Component: engine
2015-07-03 08:52:32 +08:00
5d5c8a740d
Validate status= filter to docker ps
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 7bf26d44b08de167b18257b5ddf5912585c840df
Component: engine
2015-07-02 16:12:42 -07:00
793088ed0a
Make /proc, /sys, /dev readonly for readonly containers
...
If a container is read-only, also set /proc, /sys,
& /dev to read-only. This should apply to both privileged and
unprivileged containers.
Note that when /dev is read-only, device files may still be
written to. This change will simply prevent the device paths
from being modified, or performing mknod of new devices within
the /dev path.
Tests are included for all cases. Also adds a test to ensure
that /dev/pts is always mounted read/write, even in the case of a
read-write rootfs. The kernel restricts writes here naturally and
bad things will happen if we mount it ro.
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: 5400d8873f730e6099d29af49fe45931665c3b49
Component: engine
2015-07-02 19:08:00 +00:00
7e46cb813f
Merge pull request #14359 from cpuguy83/14354_events_send_resp_immediately
...
Send resp immediately on GET /events
Upstream-commit: 71f8ca30ce7420b17151405638151bf9661a8134
Component: engine
2015-07-02 12:00:45 -07:00
fb7c276639
Send resp immediately on GET /events
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: d0a299c027fc6b075bed4992329f93e618186a83
Component: engine
2015-07-02 11:45:24 -04:00
8211ecfd09
Merge pull request #13187 from shishir-a412ed/docker_inspect_issue
...
Flag Addition: --type flag added for docker inspect command
Upstream-commit: 98f988f62ceccf7237cbcb45f1095ff15f005ea9
Component: engine
2015-07-02 01:31:15 +02:00
e43d7e0bfd
Merge pull request #14324 from aboch/ds
...
Stats API to retrieve nw stats from libnetwork
Upstream-commit: 75864dcb385e7f27870e5b0c2383dfd0e0748258
Component: engine
2015-07-01 15:19:46 -07:00
4d0125faee
Fix regression in parsing capabilities list when a single string is given
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 10a3061c5f342477703e96d9b8b2e877d9cdddf5
Component: engine
2015-07-01 21:28:02 +02:00
908ab87a15
Stats API to retrieve nw stats from libnetwork
...
- Container networking statistics are no longer
retrievable from libcontainer after the introduction
of libnetwork. This change adds the missing code
for docker daemon to retireve the nw stats from
Endpoint.
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 8b40e44c395fb307cceb6f179ffe02030b316535
Component: engine
2015-07-01 11:15:16 -07:00
576b04d570
Merge pull request #13744 from turtlebender/feature/whitelist-label-for-commit
...
Support LABEL as change for `docker commit`
Upstream-commit: 53b897ce9c1f815a047682edb4ca54baea395a64
Component: engine
2015-07-01 10:57:33 -07:00
2d91fa1913
Merge pull request #14322 from runcom/14320-fix-regression-attach-cont-notfound
...
Return not found before hijacking in attach/wsattach
Upstream-commit: 5fd0563505108a0e2da8847b33f01065af79dda4
Component: engine
2015-07-01 13:22:03 -04:00
5607e48f25
Fix regression in containers attach/wsattach api, return not found before hijacking
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 88d32a6109a15633481f758c4d0689516ae58aef
Component: engine
2015-07-01 18:16:17 +02:00
8aaef3e5b3
Flag Addition: --type flag added for docker inspect command
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: 2cb74e691538351efbdee7a78be6535f22c5d024
Component: engine
2015-07-01 12:14:01 -04:00
b5769ca9ef
Add the expected error verification for TestRmiBlank.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 2179dd00dd2e084ed833c2c22e766b56903fc12c
Component: engine
2015-07-01 19:34:43 +08:00
7f87043716
Merge pull request #14294 from mavenugo/bnone
...
fixed incorrect assumption on --bridge=none treated as disable network
Upstream-commit: a2621ac6dacf87bf713ac327f7c0e14eb77e52bc
Component: engine
2015-06-30 13:40:52 -07:00
7f4872fe6c
Merge pull request #14297 from pwaller/move-nat-pkg
...
Move /nat to /pkg/nat
Upstream-commit: caa4acc7b11cbefb74d0b066d4a0752f4a11c5ee
Component: engine
2015-06-30 13:23:30 -07:00
521162c904
fixed incorrect assumption on --bridge=none treated as disable network
...
libnetwork host, none and bridge driver initialization is incorrectly
disabled if the daemon flag --bridge=none. The expected behavior of
setting --bridge as none is to disable the bridge driver alone and let
all other modes to be operational.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: c9328c6ccf120abda297d11fcfc7e60c7c31ec21
Component: engine
2015-06-30 13:04:28 -07:00
1318ab977d
Merge pull request #14231 from ankushagarwal/checkValidPort
...
Validate hostConfig on daemon. Check for invalid port specifications
Upstream-commit: 2de810df3f552c0ddfb671276db153c27c2cd37a
Component: engine
2015-06-30 15:54:24 -04:00
0d58662487
Merge pull request #12846 from dave-tucker/network_integration
...
integration-cli: Add Tests for IPv6 and Fixed CIDR
Upstream-commit: 2d8dd6b93e641a12e998f443bae3a6be2cf9a6d5
Component: engine
2015-06-30 12:52:07 -07:00
335520845a
Merge pull request #13524 from calavera/plugin_json_spec
...
Plugins JSON spec.
Upstream-commit: f13b40f6e7678753f3414a75a6b0d175bc4d1d3f
Component: engine
2015-06-30 15:44:48 -04:00
