Commit graph

348 commits

Author SHA1 Message Date
Arnaud Porterie
53cfb9dfbe Merge pull request #160 from mlaventure/integration-test
Integration test
2016-03-25 16:25:29 -07: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
Michael Crosby
87846e3908 Merge pull request #142 from cyphar/use-go1.5.3
Dockerfile: use Go 1.5.3
2016-03-21 13:55:52 -07:00
Michael Crosby
9a9dc2e7e1 Merge pull request #145 from mlaventure/fix-makefile-generated-container-name
Add missing GIT_BRANCH variable to Makefile
2016-03-21 13:55:31 -07:00
Kenfe-Mickael Laventure
20313cb0a5 Add missing GIT_BRANCH variable to Makefile
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-03-21 13:47:13 -07:00
Michael Crosby
1000723f2d Add tonis and mickael as maintainers
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-21 13:16:12 -07:00
Michael Crosby
c404ba2499 Merge pull request #143 from kencochrane/add_static_build
Add a static build target to Makefile
2016-03-21 13:13:34 -07:00
Michael Crosby
7e3c007ea3 Update readme and version to 0.1.0
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-21 13:01:28 -07:00
Michael Crosby
c28a87cbc1 Handle term signals gracefully
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-21 12:54:57 -07:00
Ken Cochrane
d4efc0411a Add a static build target to Makefile
This allows us to build a static binary for all three binaries, from the make file using ``make static``.

Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
2016-03-21 15:50:40 -04:00
Aleksa Sarai
c4bf49630b Dockerfile: use Go 1.5.3
Go 1.5.2 is known to have security vulnerabilities in the standard
library. As such, we should use 1.5.3.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-03-21 21:27:05 +11:00
Kenfe-Mickaël Laventure
f7a3546d96 Merge pull request #140 from bfirsh/fix-spacing-in-api-proto
Fix spacing in api.proto
2016-03-19 13:26:56 -07:00
Ben Firshman
9979502ca8 Fix spacing in api.proto
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-03-18 17:37:59 -07:00
Michael Crosby
577f9d7696 Merge pull request #139 from mlaventure/git-commit
Add the git commit to the output version
2016-03-18 16:49:40 -07:00
Kenfe-Mickael Laventure
febace3633 Add the git commit to the output version
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-03-18 15:29:22 -07:00
Michael Crosby
7146b01a3d Merge pull request #138 from tonistiigi/allow-pidfile-error2
Retry on pidfile read error
2016-03-18 09:54:17 -07:00
Tonis Tiigi
f9ecd09f4f Retry on pidfile read error
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-18 09:22:13 -07:00
Michael Crosby
707555be47 Merge pull request #137 from docker/shim-errors
Don't treat runtime error as shim error
2016-03-17 16:45:03 -07:00
Michael Crosby
dca8e5995f Merge pull request #136 from docker/revert-deps
Revert go 1.5+ dep management
2016-03-17 16:33:02 -07:00
Michael Crosby
0969765fad Don't treat runtime error as shim error
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-17 16:32:35 -07:00