vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity
667 commits 2 branches 0 tags 33 MiB
Commit graph

667 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kenfe-Mickael Laventure
a75c94a195 Update busybox top to check validity of running container list 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-30 15:08:20 -07:00
Michael Crosby
d9c2b13dbc Merge pull request #171 from mlaventure/sleep-test 
Sleep test
 2016-03-30 15:07:17 -07:00
Kenfe-Mickael Laventure
fd888e8f34 Return the runtime error message on failed pause and resume calls 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-29 11:40:05 -07:00
Kenfe-Mickael Laventure
9455c01bc4 Add a test checking container life duration 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-29 10:47:51 -07:00
Kenfe-Mickael Laventure
203651e774 Allow tests to specify their own events filter routine 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-29 10:47:51 -07:00
Michael Crosby
aa976325f5 Merge pull request #169 from mlaventure/fix-runtime-root 
Ensure that --root is passed to oci when using runtime args
 2016-03-29 10:45:12 -07:00
Kenfe-Mickael Laventure
f07c5ac52a Ensure that runtimeArgs always get passed down to the oci runtime 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-29 10:32:37 -07:00
Michael Crosby
5b0a213766 Merge pull request #167 from mlaventure/containers-life-events-test 
Containers life events test
 2016-03-28 17:01:50 -07:00
Kenfe-Mickael Laventure
90009c8a31 Add a test checking a ls container generated events 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-28 11:35:21 -07:00
Kenfe-Mickael Laventure
3481996e9d Add a way to retrieve a test container event channel 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-28 11:35:21 -07:00
Kenfe-Mickael Laventure
e6b2ed4b7f Wait maximum 3s per container kill when tearing down a test 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-28 11:35:21 -07:00
Kenfe-Mickael Laventure
20ee648540 Add per test and suite timeout values to Makefile 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-28 11:35:16 -07:00
Kenfe-Mickael Laventure
bf20f56615 Rename busybox-NoSuchFile test bundle to busybox-no-such-file 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-28 10:40:33 -07:00
Michael Crosby
dec6a0dc4d Merge pull request #166 from mlaventure/add-grpc-timeout 
Add grpc timeout
 2016-03-28 10:23:51 -07:00
Kenfe-Mickael Laventure
4ecebc4e0f Add timeout option for GRPC connection 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-28 10:09:40 -07:00
Kenfe-Mickael Laventure
6ba0e0fc44 Add integration-test/test-artifacts to .gitignore 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-28 10:09:16 -07:00
Michael Crosby
3d72dc1e4e Merge pull request #161 from calavera/enable_pprof 
Enable http pprof connections when pprof-address flag is set
 2016-03-25 17:27:08 -07:00
Arnaud Porterie
53cfb9dfbe Merge pull request #160 from mlaventure/integration-test 
Integration test
 2016-03-25 16:25:29 -07:00
David Calavera
06bcd7d03c Enable http pprof connections when pprof-address is set. 
Add flag to specify the address where those connections listen.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-03-25 17:46:10 -04:00
Kenfe-Mickael Laventure
cb69ab45ee Add initial integration tests framework 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-25 12:08:51 -07:00
Kenfe-Mickael Laventure
9992d2e1bd Vendor go-check in 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-25 11:03:48 -07:00
Kenfe-Mickael Laventure
3f388f8638 Take runtimeArgs in account when loading containers state 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-25 11:03:11 -07:00
Kenfe-Mickael Laventure
bac78851e0 Append error message to internal errors 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-25 11:03:11 -07:00
Kenfe-Mickael Laventure
e500586d8f Disable metrics if interval is less or equal to 0 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-25 11:03:11 -07:00
Kenfe-Mickael Laventure
4796ec8d9d Build containerd binaries within the container 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-25 11:03:11 -07:00
Michael Crosby
ef821ea93f Merge pull request #159 from mlaventure/use-fix-hashes-for-vendoring 
Update vendor.sh to use fix hashes
 2016-03-25 10:32:18 -07:00
Kenfe-Mickael Laventure
00358ec939 Update vendor.sh to use fix hashes 
This ensure that users can reproduce a containerd build exactly as it
was done during release.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-24 19:05:29 -07:00
Michael Crosby
a06dec80cd Merge pull request #151 from mlaventure/ctr-retrieve-missed-events 
Retrieve ctr missed events once connection is re-established
 2016-03-24 16:57:18 -07:00
Michael Crosby
471bb07521 Merge pull request #158 from docker/runtime-opts 
Add runtimeArgs to pass to shim
 2016-03-24 15:53:05 -07:00
Michael Crosby
6e4d5b385c Add runtimeArgs to pass to shim 
This allows you to pass options like:

```bash
containerd --debug --runtime-args "--debug" --runtime-args
"--systemd-cgroup"
```

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-03-24 13:31:27 -07:00
Michael Crosby
5f0f162c62 Merge pull request #150 from mlaventure/ctr-reset-termios 
Fix cases where ctr wouldn't properly restore the terminal termios
 2016-03-23 15:35:57 -07:00
Michael Crosby
c761085e92 Merge pull request #154 from tonistiigi/update-runc 
Update runc
 2016-03-23 14:14:42 -07:00
Michael Crosby
c056573b53 Merge pull request #155 from tonistiigi/stdin-closer-fix 
Fix closing stdin before everything has been written to pipe
 2016-03-23 13:32:09 -07:00
Tonis Tiigi
fa0efa2906 Fix closing stdin before everything has been written to pipe 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-23 12:12:56 -07:00
Tonis Tiigi
918728900a vendor: update runc 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-22 21:08:21 -07:00
Tonis Tiigi
85202e62bf vendor: clean runs unused files 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-22 21:08:15 -07:00
Kenfe-Mickaël Laventure
0c1445dedf Merge pull request #153 from tonistiigi/prefix-error 
Add prefixes to external errors
 2016-03-22 21:06:41 -07:00
Tonis Tiigi
bbf760ee6f Add prefixes to external errors 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-22 19:38:22 -07:00
Kenfe-Mickael Laventure
2b8ae55b0b Retrieve ctr missed events once connection is re-established 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-22 11:25:20 -07:00
Michael Crosby
142e22a4dc Merge pull request #149 from mlaventure/fix-vet-errors 
Fix go vet errors
 2016-03-22 10:54:08 -07:00
Michael Crosby
582c2712cc Merge pull request #147 from hqhq/hq_update_readme 
Update README
 2016-03-22 10:38:43 -07:00
Kenfe-Mickael Laventure
cad6fb95ab Fix cases where ctr wouldn't properly restore the terminal termios 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-22 10:19:38 -07:00
Kenfe-Mickael Laventure
514ca2d407 Fix go vet errors 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-22 09:47:03 -07:00
Kenfe-Mickaël Laventure
eaba9814b4 Merge pull request #148 from tiborvass/fix-bug 
Factor out some leftover direct references to runc binary
 2016-03-22 09:10:22 -07:00
Tibor Vass
2406bbc1ca Factor out some leftover direct references to runc binary 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-03-22 12:01:25 -04:00
Kenfe-Mickaël Laventure
d0f2c32679 Merge pull request #146 from tiborvass/custom-shim-binary 
Have containerd-shim filename depend on containerd filename
 2016-03-22 08:58:09 -07:00
Qiang Huang
8dc52a6461 Update bundle.md 
As we only have config.json in specs now.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-03-22 15:07:27 +08:00
Qiang Huang
f6313ebfaf Update README 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-03-22 13:58:33 +08:00
Tibor Vass
b0681dd523 Have containerd-shim filename depend on containerd filename 
If containerd binary is renamed to docker-containerd, then it should
invoke the docker-containerd-shim binary.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-03-21 21:33:35 -04:00
Michael Crosby
54c213e8a7 Merge pull request #144 from docker/handle-term 
Handle term signals and update documentation
 2016-03-21 16:44:28 -07:00