Commit Graph

319 Commits

Author SHA1 Message Date
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
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
Michael Crosby b4c901f34a Revert "Switch to new vendor directory layout"
This reverts commit d5742209d3.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-17 16:10:24 -07:00
Michael Crosby a21a956a2d Revert "Check for minimum golang version"
This reverts commit c6680da78b.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-17 16:10:15 -07:00
Michael Crosby 5617360b3a Merge pull request #135 from docker/deps-errors
Return errors from shim and missing shim/runc
2016-03-17 14:53:20 -07:00
Michael Crosby 6ba5767b70 Return errors from shim in log
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-17 14:44:03 -07:00
Michael Crosby 366dcc08fa Add specific error message for missing shim
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-17 14:13:08 -07:00
Tõnis Tiigi 797e79774f Merge pull request #133 from tonistiigi/raise-wait-timeout
Raise pidfile wait timeout
2016-03-16 17:59:21 -07:00
Tonis Tiigi edd3265858 Raise pidfile wait timeout
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-16 17:45:51 -07:00
Michael Crosby 3041015da2 Merge pull request #132 from marcosnils/vendor_layout
Switch to new vendor directory layout
2016-03-16 16:44:00 -07:00
Marcos Lilljedahl c6680da78b Check for minimum golang version
Signed-off-by: Marcos Lilljedahl <marcosnils@gmail.com>
2016-03-16 17:16:46 -03:00
Marcos Lilljedahl d5742209d3 Switch to new vendor directory layout
Fixes #113

Signed-off-by: Marcos Lilljedahl <marcosnils@gmail.com>
2016-03-16 01:56:22 -03:00
Michael Crosby bc6adb7e4d Merge pull request #131 from docker/shim-exec-fixes
Fixes for docker integration
2016-03-15 11:52:25 -07:00
Michael Crosby a4844a68a6 Add exec rlimit support to containerd
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-15 11:46:47 -07:00
Michael Crosby e637c1ea80 Update specs imports for specs-go
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-15 11:31:32 -07:00
Michael Crosby 2db0341e38 Update runc and specs vendor deps
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-15 11:19:21 -07:00
Michael Crosby 52a1dfb418 Call delete before closing IO in shim
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-14 16:58:56 -07:00
Michael Crosby bd23df8fd1 Remove process dir and entry on error
If we fail to exec a process make sure that it is cleaned up within the
container's information and on disk state.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-14 16:05:45 -07:00
Michael Crosby ca6ae2e64b Remove container on load if it exited
If the shim gets sigkilled while containerd is down we need to be able
to remove the container correctly so that it does not stay in a stopped
state forever.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-14 14:23:24 -07:00
Michael Crosby 94568b7a9b Don't send exit event on failure
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-11 16:40:42 -08:00
Michael Crosby 17e4d62ab0 Update runc state dir
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-11 16:06:38 -08:00
Michael Crosby dfad5da97a Merge pull request #130 from tonistiigi/wait-stdio
Wait for stdio to close before exiting
2016-03-11 15:03:14 -08:00
Tonis Tiigi e57fccc481 Wait for stdio to close
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-11 14:49:01 -08:00
Michael Crosby 41d041270b Merge pull request #129 from docker/errors
Handle start errors sync with runc
2016-03-11 11:42:07 -08:00
Michael Crosby b68bc651a8 Handle start errors sync with runc
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-11 10:13:34 -08:00
Michael Crosby 22dac6af92 Merge pull request #128 from tonistiigi/fix-userns
Fix userns mapping for tty
2016-03-11 09:24:21 -08:00
Tonis Tiigi 4700b961ca Fix userns mapping for tty
- Linux part of the spec was ignored
- Exec used empty spec

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-10 23:09:39 -08:00
Michael Crosby 0abc46f9e8 Merge pull request #126 from tonistiigi/pidsstats
Add pids stats
2016-03-08 18:15:26 -08:00
Tonis Tiigi ab5eae56bf Add pids stats
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-08 16:13:10 -08:00
Michael Crosby 21ec630979 Merge pull request #125 from docker/proc-caps
Add support for process caps and security fields and update resources
2016-03-07 17:29:32 -08:00
Michael Crosby 0dd075a47b Add update rpc for resource updates
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-07 15:23:52 -08:00