clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-28 00:50:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,618 Commits 9 Branches 112 Tags
72b75cd4e764e25cecd3f0c100597b8868c68120
Commit Graph
1593 Commits
Author SHA1 Message Date
Doug Davis 72b75cd4e7 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>
 2015-07-10 07:27:11 -07:00
Doug Davis 899c85b405 Minor fix to the exec inspect test 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-07-10 06:19:03 -07:00
Brian Goff 6e64e0548f Merge pull request #14514 from hqhq/hq_fix_file_leak 
Fix file leak in integration-cli
 2015-07-09 21:52:59 -04:00
Jessie Frazelle 56e8a99b61 Merge pull request #14480 from Microsoft/fix-windows-ci 
Fix Windows CI fail due to GH13866
 2015-07-09 16:37:41 -07:00
Megan Kostick a8715ea220 Port POST container attach tests 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
 2015-07-09 12:52:45 -07:00
John Howard c1b524486c Fix Windows CI fail due to GH13866 and patch up tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-07-09 10:09:45 -07:00
Phil Estes 37771c122b Merge pull request #14498 from calavera/fix_volume_from_references 
Fix volumes-from mount references.
 2015-07-09 12:34:27 -04:00
Alexander Morozov 5369b6cf29 Merge pull request #14348 from sunyuan3/TestPullImageWithAllTagFromCentralRegistry 
Add TestPullImageWithAllTagFromCentralRegistry test case.
 2015-07-09 09:56:53 -06:00
David Calavera 3d029c3bf3 Fix volumes-from mount references. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-07-09 09:01:57 -06:00
Qiang Huang d28b0ba115 Fix file leak in integration-cli 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-07-09 18:52:18 +08:00
Alexander Morozov 67058e388b Remove prefix dots from inspects in tests 
Dots prepended to key in inspectField function

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-07-08 12:41:05 -07:00
Yuan Sun c9a4c1401f Add TestPullImageWithAllTagFromCentralRegistry test case. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-07-08 19:47:33 +08:00
Lei Jitang 289ee90b04 Fix copy from a "created" container. Fixes #14420 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-07-08 11:15:09 +08:00
Jessie Frazelle 2cd417df73 Merge pull request #14388 from runcom/14316-fix-events-filters 
Fix combined image events filters
 2015-07-07 18:08:56 -07:00
Michael Crosby a5283d2ff3 Merge pull request #13866 from brahmaroutu/runOOM_13766 
RunOOM test should check to see if Oom Control is enabled
 2015-07-07 16:21:46 -07:00
Arnaud Porterie e3966c1031 Merge pull request #14380 from sunyuan3/TestRunCapAddCHOWN 
add TestRunCapAddCHOWN test case
 2015-07-07 12:36:14 -07:00
Brian Goff 10bbf62081 Merge pull request #14375 from coolljt0725/fix_test_events_default_empty 
Fix test TestEventsDefaultEmpty. Fixes #14360
 2015-07-07 10:37:40 -04:00
Antonio Murdaca 61418e39d5 Merge pull request #14428 from sunyuan3/TestPushBusyboxImage 
Correct wrong comment of TestPushBusyboxImage.
 2015-07-07 14:44:08 +02:00
Yuan Sun f244ed2531 Correct wrong comment of TestPushBusyboxImage. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-07-07 16:10:37 +08:00
Lei Jitang 2802831218 Fix test TestEventsDefaultEmpty. Fixes #14360 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-07-07 11:27:00 +08:00
root e7fb38410d RunOOM test should check to see if Oom Control is enabled 
closes #13766
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-07-06 21:15:55 +00:00
Vincent Demeester 6e4c6da819 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>
 2015-07-06 22:08:35 +02:00
Antonio Murdaca 19e6de2654 Fix combined image events filters 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-04 00:19:08 +02:00
Yuan Sun 230179c8dc add TestRunCapAddCHOWN test case 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-07-03 23:25:52 +08:00
Ma Shimiao 801a7fed19 api/server: Add missing json check 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-07-03 08:52:32 +08:00
David Calavera 71f8ca30ce Merge pull request #14359 from cpuguy83/14354_events_send_resp_immediately 
Send resp immediately on GET /events
 2015-07-02 12:00:45 -07:00
Brian Goff d0a299c027 Send resp immediately on GET /events 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-07-02 11:45:24 -04:00
Sebastiaan van Stijn 98f988f62c Merge pull request #13187 from shishir-a412ed/docker_inspect_issue 
Flag Addition: --type flag added for docker inspect command
 2015-07-02 01:31:15 +02:00
Alexander Morozov 75864dcb38 Merge pull request #14324 from aboch/ds 
Stats API to retrieve nw stats from libnetwork
 2015-07-01 15:19:46 -07:00
Antonio Murdaca 10a3061c5f Fix regression in parsing capabilities list when a single string is given 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-01 21:28:02 +02:00
Alessandro Boch 8b40e44c39 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>
 2015-07-01 11:15:16 -07:00
Alexander Morozov 53b897ce9c Merge pull request #13744 from turtlebender/feature/whitelist-label-for-commit 
Support LABEL as change for `docker commit`
 2015-07-01 10:57:33 -07:00
Brian Goff 5fd0563505 Merge pull request #14322 from runcom/14320-fix-regression-attach-cont-notfound 
Return not found before hijacking in attach/wsattach
 2015-07-01 13:22:03 -04:00
Antonio Murdaca 88d32a6109 Fix regression in containers attach/wsattach api, return not found before hijacking 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-01 18:16:17 +02:00
Shishir Mahajan 2cb74e6915 Flag Addition: --type flag added for docker inspect command 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2015-07-01 12:14:01 -04:00
Yuan Sun 2179dd00dd Add the expected error verification for TestRmiBlank. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-07-01 19:34:43 +08:00
David Calavera a2621ac6da Merge pull request #14294 from mavenugo/bnone 
fixed incorrect assumption on --bridge=none treated as disable network
 2015-06-30 13:40:52 -07:00
Alexander Morozov caa4acc7b1 Merge pull request #14297 from pwaller/move-nat-pkg 
Move /nat to /pkg/nat
 2015-06-30 13:23:30 -07:00
Madhu Venugopal c9328c6ccf 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>
 2015-06-30 13:04:28 -07:00
Brian Goff 2de810df3f Merge pull request #14231 from ankushagarwal/checkValidPort 
Validate hostConfig on daemon. Check for invalid port specifications
 2015-06-30 15:54:24 -04:00
Arnaud Porterie 2d8dd6b93e Merge pull request #12846 from dave-tucker/network_integration 
integration-cli: Add Tests for IPv6 and Fixed CIDR
 2015-06-30 12:52:07 -07:00
Brian Goff f13b40f6e7 Merge pull request #13524 from calavera/plugin_json_spec 
Plugins JSON spec.
 2015-06-30 15:44:48 -04:00
Ankush Agarwal 477201a295 Validate Port specifications on daemon side 
Fixes #14230

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-06-30 12:14:49 -07:00
Peter Waller 9c2374d196 Move /nat to /pkg/nat 
By convention /pkg is safe to use from outside the docker tree, for example
if you're building a docker orchestrator.

/nat currently doesn't have any dependencies outside of /pkg, so it seems
reasonable to move it there.

This rename was performed with:

```
gomvpkg -vcs_mv_cmd="git mv {{.Src}} {{.Dst}}" \
	-from github.com/docker/docker/nat \
        -to   github.com/docker/docker/pkg/nat

```

Signed-off-by: Peter Waller <p@pwaller.net>
 2015-06-30 17:43:17 +01:00
Alexander Morozov 475ae0889e Merge pull request #14218 from calavera/fix_exec_user 
Default process user to container config user.
 2015-06-29 14:31:45 -07:00
David Calavera 0faa4518ed Default process user to container config user. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-06-29 12:52:05 -07:00
David Calavera 333ac3a3eb Plugins JSON spec. 
Allow full configuration of external plugins via a JSON document.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-06-29 10:32:18 -07:00
Dave Tucker 2dfb7f3b7d integration-cli: Add Tests for IPv6 and Fixed CIDR 
This patch adds tests for the `--ipv6` and `--fixed-cidr` daemon flags

Signed-off-by: Dave Tucker <dt@docker.com>
 2015-06-29 14:45:00 +01:00
Brian Goff 17d6f00ec2 Fix unmarshalling of Command and Entrypoint 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-06-26 09:00:57 -07:00
Jana Radhakrishnan 9bb69f9726 Fix endpoint leave failure for --net=host mode 
When a container is started with `--net=host` with
a particular name and it is subsequently destroyed,
then all subsequent creations of the container with
the same name will fail. This is because in `--net=host`
the namespace is shared i.e the host namespace so
trying to destroy the host namespace by calling
`LeaveAll` will fail and the endpoint is left with
the dangling state. So the fix is, for this mode, do
not attempt to destroy the namespace but just cleanup
the endpoint state and return.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-06-24 12:33:52 -07:00