Commit graph

288 commits

Author SHA1 Message Date
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
Michael Crosby
44d6a60e7e Add process cap support to add process rpc
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-07 11:01:28 -08:00
Michael Crosby
a46c45d05d Update specs and runc dependencies
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-07 10:30:59 -08:00
Michael Crosby
319af0765b Default metrics interval to 5m
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-01 11:22:08 -08:00
Michael Crosby
7cbe3e759d Remove oom flag on daemon
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-01 11:17:29 -08:00
Michael Crosby
17dc3f649c Add containerd service file
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-01 11:06:12 -08:00
Michael Crosby
c63b541ab0 Merge pull request #123 from docker/oom
Add oom support to events
2016-02-29 17:02:56 -08:00
Michael Crosby
500ca74f38 Add oom support to events
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-02-29 17:01:40 -08:00
Michael Crosby
70a8c1ec3f Merge pull request #122 from jhowardmsft/closertoctrcompiling
Getting ctr closer to compiling on Windows
2016-02-29 14:20:08 -08:00
John Howard
d4ca79c978 Getting ctr closer to compiling on Windows
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-29 12:42:30 -08:00
Michael Crosby
8d2051232a Merge pull request #121 from mlaventure/only-send-live-if-needed
Send "live" event only if past events requested
2016-02-29 11:25:51 -08:00
Kenfe-Mickael Laventure
e8b602462a Send "live" event only if past events requested
This fixes a bug where the live events are recorded in the events log.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-02-29 11:18:11 -08:00
Michael Crosby
c242792f21 Merge pull request #115 from docker/opts
Various fixes and improvements
2016-02-29 10:48:41 -08:00
John Howard
b044ff0f29 Refactor process.go for platform specific
Signed-off-by: John Howard <jhoward@microsoft.com>

Move process sorter to new file

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Sort containers by id

This will not be the most accurate sorting but atleast the list will be
consistent inbetween calls.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Allow runtime to be configurable via daemon start

This allows people to pass an alternate name or location to the runtime
binary to start containers.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Fix state output for containers

Return the proper state/status for a container by checking if the pid is
still alive.  Also fix the cleanup handling in the shim to make sure
containers are not left behind.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Properly wait for container start

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-02-29 10:43:35 -08:00
Michael Crosby
0ad7654f80 Merge pull request #120 from jhowardmsft/nocrashonstartup
Making it not crash on Windows
2016-02-29 10:07:03 -08:00
John Howard
3d8e37cf9d Making it not crash on Windows
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-28 19:02:24 -08:00
Michael Crosby
b413f33b99 Merge pull request #118 from jhowardmsft/grpc
Final bit of compiling on Windows
2016-02-26 15:52:54 -08:00
John Howard
dd192f4cd9 Final bit of compiling on Windows
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-26 15:38:05 -08:00
Michael Crosby
cc6ba36498 Merge pull request #117 from jhowardmsft/supervisor
Supervisor compiles on Windows
2016-02-26 15:05:11 -08:00
John Howard
cdb5947f86 Supervisor compiles
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-26 14:58:15 -08:00
Michael Crosby
cc00a35bfc Merge pull request #116 from jhowardmsft/runtimecompiles
runtime compiles on Windows
2016-02-26 14:34:17 -08:00
John Howard
2b8f022950 runtime compiles on Windows
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-26 14:01:06 -08:00
Michael Crosby
ab74e7b2aa Merge pull request #112 from jhowardmsft/processsyscalls
Refactor process.go for platform specific
2016-02-26 11:04:19 -08:00
Michael Crosby
2644a7dfd5 Merge pull request #110 from jhowardmsft/factorgetrootids
Refactors getRootIDs
2016-02-26 11:04:05 -08:00
Michael Crosby
2868670ba6 Merge pull request #114 from mlaventure/events-stream-log-end-event
Add a new "live" Event type
2016-02-26 10:10:18 -08:00
Kenfe-Mickael Laventure
4ca592f56e Add a new "live" Event type
This event type is used to notify consumers that everything following
are real-time events. This allow clients that request events from the
backlog to detect when those events have all been sent.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-02-25 16:39:54 -08:00
John Howard
1acf68535a Refactor process.go for platform specific
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-25 13:01:17 -08:00
John Howard
817c2089aa Refactors getRootIDs
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-25 12:13:21 -08:00
Michael Crosby
3856e27560 Merge pull request #109 from jhowardmsft/fixosutils
First step towards compiling on Windows
2016-02-25 10:33:25 -08:00
John Howard
a9fdab9721 First step towards compiling on Windows
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-25 10:27:43 -08:00
Michael Crosby
44252266e7 Merge pull request #107 from mlaventure/fix-stats-cmd
Fix stats command not returning
2016-02-25 10:22:53 -08:00
Michael Crosby
7424c8bf1a Merge pull request #108 from mlaventure/ctr-new-commands
Add pause, resume, watch command to ctr
2016-02-25 10:22:48 -08:00