Commit graph

685 commits

Author SHA1 Message Date
Michael Crosby
49710435b7 Cleanup example usage and defaults
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-09-28 15:36:46 -07:00
Michael Crosby
df79231bdf Add exec to example
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-09-28 15:27:24 -07:00
Michael Crosby
b3ab74fee3 Add rough container type and runc runtime
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-09-28 15:09:22 -07:00
Stephen J Day
c2da97c4d1 containerkit: layer manipulator overlay poc
A light weight overlay implementation that emits working mounts is
demonstrated. One can prepare and commit changes. The diffs are
correctly held on disk.

The next step from here is to implement the changes methods and ensure
that we can work with the docker registry API.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-09-26 21:43:58 -07:00
Stephen J Day
34b630c861 layers: add design and structure of layer manipulator
We define the approach and API of the LayerManipulator. It provides a
model for a bare bones graph driver using a simplified snapshotting
model. Callers Prepare and Commit diff paths to build up a tree of
interelated layers, all without being coupled to the layer diff format
or an image runtime.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-09-26 19:34:43 -07:00
Stephen J Day
49ce56467e containerkit: change package name of root package
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-09-26 18:16:00 -07:00
Stephen J Day
ba1e290d12 containerkit: define mount type
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-09-26 18:15:19 -07:00
Michael Crosby
478f715836 Rename archutils to epoll
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-09-22 14:08:41 -07:00
Michael Crosby
97c3c3847a Refactor epoll monitor for generic use
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-09-22 14:03:45 -07:00
Michael Crosby
b6bf350a07 Merge container.protos
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-09-22 11:29:20 -07:00
Stephen J Day
32a25d5523
api: begin to define the containerkit api
This commit cuts out the structure for defining grpc services for this
project. To provide compatibility with go package generation and support
reuse, we use a single protobuf file per package and make the import
paths relative to the GOPATH.

This first pass attempts to position the Mount type as the lingua franca
of ContainerKit. The Images service will provide paths prepared for use
as a set of mounts of the container service.

We'll need to merge the container service in place with new file defined
here.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-09-20 20:22:23 -07:00
Michael Crosby
40003e7085 Add supervisor config
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-09-20 15:30:35 -07:00
Michael Crosby
0dcd3a034d Add additional request/response protos
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-09-20 12:01:28 -07:00
Michael Crosby
ce7702f2db Add initial container protos and service
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-09-20 11:20:48 -07:00
Michael Crosby
97dbfe9e1f Move cputicks into osutils package
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-09-20 11:20:17 -07:00
Michael Crosby
37260f75db Refactor containerd main
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-09-20 10:29:42 -07:00
Michael Crosby
435a1c825d Refactor api/http to just pprof
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-09-20 10:22:19 -07:00
Michael Crosby
058eea362a Remove go-metrics
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-09-20 10:14:53 -07:00
Michael Crosby
0645faf690 Update readme for containerkit
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-09-20 09:32:10 -07:00
Michael Crosby
2545227b03 Merge pull request #320 from mlaventure/handle-pid-host-children
Notify containerd of init death before waiting for children in Shim
2016-09-20 09:10:06 -07:00
Kenfe-Mickael Laventure
61338577b5 Notify containerd of init death before waiting for children in shim
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-09-19 15:15:09 -07:00
Michael Crosby
0eccb0d224 Merge pull request #319 from mlaventure/harmonize-event-status-type
Use uint32 as Event's Status type everywhere
2016-09-19 13:16:35 -07:00
Kenfe-Mickael Laventure
db9aed5a97 Use uint32 as Event's Status type everywhere
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-09-19 12:01:34 -07:00
Michael Crosby
4eb3147efc Merge pull request #317 from mlaventure/handle-exec-clingy-children
Handle exec clingy children
2016-09-19 11:53:06 -07:00
Kenfe-Mickael Laventure
600b4d1154 Remove containerd as subreaper
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-09-16 13:38:17 -07:00
Kenfe-Mickael Laventure
85050da1e0 Update ExitStatusFile correctly if process died while daemon was down
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-09-16 13:30:16 -07:00
Kenfe-Mickael Laventure
18c76025a1 Wait for all exec process child before exiting from shim
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-09-16 13:30:16 -07:00
Kenfe-Mickael Laventure
920a9c21d7 Don't hog task queue while waiting for exec process
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-09-16 13:30:16 -07:00
Michael Crosby
578bf0c70e Merge pull request #314 from mikedanese/update-grpc
update grpc dependency to v1.0.1-GA
2016-09-14 10:49:10 -07:00
Mike Danese
3492af35ba grpc: regenerate protos and adjust for new package API
Signed-off-by: Mike Danese <mikedanese@google.com>
2016-09-12 11:37:24 -07:00
Mike Danese
ea36fe0bb7 vendor: update grpc to v1.0.1-GA
The currently used go-grpc client is rather old (a commit from May).
Since then a GA release has been cut, so let's use that.

Signed-off-by: Mike Danese <mikedanese@google.com>
2016-09-12 11:36:39 -07:00
Kenfe-Mickaël Laventure
4c21ad662f Merge pull request #316 from mlaventure/add-missing-printf-arg
Add missing printf parameter when starttime write fails
2016-09-12 09:39:44 -07:00
Kenfe-Mickael Laventure
f7de90516f Add missing printf parameter when starttime write fails
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-09-12 09:32:51 -07:00
Kenfe-Mickaël Laventure
ddf95cb0fb Merge pull request #315 from LK4D4/add_health_check
Add grpc health check service
2016-09-12 07:37:32 -07:00
Alexander Morozov
d5f9910cee Add grpc health check service
Also, block on dial in integration tests

Signed-off-by: Alexander Morozov <lk4d4math@gmail.com>
2016-09-09 13:14:47 -07:00
Michael Crosby
35a736c471 Merge pull request #313 from mlaventure/handle-sigkilled-shim-the-return
Handle shim being sigkilled while containerd is down
2016-09-08 14:48:52 -07:00
Kenfe-Mickael Laventure
3281909583 Handle shim being sigkilled while containerd is down
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-09-08 14:37:55 -07:00
Michael Crosby
b6b2fd623e Merge pull request #311 from mlaventure/handle-sigkilled-shim
Handle sigkilled shim
2016-09-07 10:45:37 -07:00
Kenfe-Mickael Laventure
fe5f3d5581 Add proper handling for SIGKILL'ed shim
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-09-07 10:30:02 -07:00
Kenfe-Mickael Laventure
dd71165fc6 Fix position of $(TESTFLAGS) in Makefile
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-09-07 10:30:02 -07:00
Kenfe-Mickaël Laventure
3a65d238a9 Start runc in detached mode when restoring a checkpoint (#312)
Without this the shim cannot detect the death of the init process.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-09-07 09:26:37 -07:00
Kenfe-Mickaël Laventure
4f0a33ac3d Dump runtime stacks on USR1 reception (#292)
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-08-30 09:47:21 -07:00
Yu, Zou
79c7673858 add more blkio subsystem parameters to control according to ones provided by runc. (#304)
Signed-off-by: Yu Zou <zouyu7@huawei.com>
2016-08-26 11:07:45 -07:00
Kenfe-Mickaël Laventure
526a861988 Avoid panicing if cmd.Start() from container.createCmd() failed (#305)
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-08-26 10:56:18 -07:00
K3A
403ccb155b Update Makefile (#303)
adding LDFLAGS for "shim" target as well.

Signed-off-by: Mario Hros <spam@k3a.me>
2016-08-26 10:55:21 -07:00
Phil Estes
8508d2bec9 Don't call runc start when restoring a checkpoint (#302)
The create/start split left checkpoint/restore broken in that the create
side was calling runc restore, which fully restores the process to
operation, leaving a call to `runc start` as an error (process already
started). This patch skips process.Start as it is an unnecessary (and
wrong) step for a restored checkpoint.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2016-08-26 10:25:19 -07:00
Michael Dougherty
edc124c8e7 Initial jenkinsfile (#306)
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
2016-08-26 10:24:30 -07:00
Damien Lespiau
d77bc40d5c shim: Fix description of cwd and arguments given to the shim process (#307)
That comment didn't seem to match the reality and confused me a bit. The
shim takes 3 arguments and the cwd is the containerd state directory.

I'm guessing it's a left over from the containerd split.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2016-08-26 09:41:11 -07:00
Damien Lespiau
ab90816c41 A few .gitignore updates (#308)
* gitignore: Use absolute paths

git status will only match the ignored path from the root of the
repository, a very slightly more accurate way to ignore those files.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>

* gitignore: Ignore the /output directory

Test artifacts are now generated in /output, so update the .gitignore
file accordingly.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2016-08-26 09:40:41 -07:00
Lei Jitang
95d78cad59 Remove obsolete comment about reaper in containerd/main.go (#297)
Sigchld reaper has been removed from containerd procss in
847690583f, so the comment
is not need any more.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-08-15 09:54:47 -07:00