Commit graph

46 commits

Author SHA1 Message Date
Stephen J Day
83e7610194
cmd/ctrd-protobuild: create proper command for building protos
After trying to explain the complexities of developing with protobuf, I
have now created a command that correctly calculates the import paths
for each package and runs the protobuf command.

The Makefile has been updated accordingly, expect we now no longer use
`go generate`. A new target `protos` has been defined. We alias the two,
for the lazy. We leave `go generate` in place for cases where we will
actually use `go generate`.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-02-15 12:05:27 -08:00
Akihiro Suda
bf8abef70f api: introduce api/{types,services} for deduplication of API definition
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-02-14 02:42:13 +00:00
Gábor Lipták
19ca156c91 Enable codecov.io
Signed-off-by: Gábor Lipták <gliptak@gmail.com>
2017-01-26 06:31:38 -05:00
Samuel Karp
cacda40317 snapshot: Separate tests using root from non-root
Signed-off-by: Samuel Karp <skarp@amazon.com>
2017-01-25 17:13:29 -08:00
Kunal Kushwaha
2a5f51ecf9 Adding dist to Makefiley
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2017-01-24 13:26:19 +09:00
Michael Crosby
61e7fbde4c Remove check for binaries
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-01-19 11:09:27 -08:00
Akihiro Suda
5fb38ce49c Makefile: allow make install without go
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-01-19 11:05:52 -08:00
Akihiro Suda
bcfb5e7cee Revert "Makefile: remove FORCE dependency"
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-01-19 01:28:43 +00:00
Akihiro Suda
029265f67c Makefile: remove FORCE dependency
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-01-16 08:58:20 +00:00
Akihiro Suda
3793d19bfe Makefile: new variable: TESTFLAGS
e.g.

    $ TESTFLAGS="-race -v -parallel 16" make test

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-01-13 04:28:24 +00:00
Kenfe-Mickael Laventure
478f50fb2e Vendor golang.org/x/sys/unix
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-01-12 11:21:06 -08:00
Kenfe-Mickael Laventure
3cb57fa2d6 Add containerd-shim binary
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-01-12 10:29:37 -08:00
Michael Crosby
f651e60a3c Make make work
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-12-12 10:32:54 -08:00
Stephen J Day
4d1a30ff41
api: protos now pass lint checks
Generation is likely broken, but the Makefile linter now passes. Another
pass will have a fully working toolchain.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-12-01 12:22:05 -08:00
Stephen J Day
2507ee35bb
Makefile: remove all references to gomock
We won't make the mistake of using gomock in this project.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-12-01 12:11:47 -08:00
Stephen J Day
ab088af2a6
cmd, Makefile: add initial build structure
This adds Makefile and cmd/protoc-gen-gogoctrd for generating protobufs.
More adjustments are required and the default target has been stubbed
out for now.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-12-01 12:04:23 -08:00
Michael Crosby
1c6ed30a79 Remove vendor and fix go build
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-11-07 13:15:32 -08: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
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
Julio Montes
0227e9fb94 Micro Benchmarks: multiples runtimes (#268)
* Micro benchmarks: use container.Runtime to kill container

Signed-off-by: Julio Montes <julio.montes@intel.com>

* Micro benchmarks: add support for multiples runtimes

Signed-off-by: Julio Montes <julio.montes@intel.com>
2016-06-16 14:39:19 -07:00
Kenfe-Mickaël Laventure
5624732128 Add golint to test (#255)
* Add a new lint rule to the Makefile

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>

* Fix linter errors

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>

* Allow replacing the default apt mirror

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-03 15:00:49 -07:00
Anusha Ragunathan
24144682a0 Micro benchmarks for containerd. (#244)
This is the first in a series of micro benchmarks for containerd.
Performance measurement will use containerd objects and methods
that are not dependent on the grpc API and dont require the daemon
to the running. Test will require containerd-shim and runc.

The motivation is to understand the baseline performance at the lowest
containerd layer. A natural extension to this effort would be to write
macro benchmarks which would include API and daemon.

Note:
- Currently measures only one workload (busybox sh) start times. Will
add other bundles and args soon.
- Can use integration-test utils for bundle processing. However, json
marshal/unmarshal is currently timing out standard benchmark times. So
going with default spec for now.

Sample run:
BenchmarkBusyboxSh-4    / # / # / #        2     576013841 ns/op
ok      github.com/docker/containerd/runtime    1.800s

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-05-27 10:35:42 -07:00
Kenfe-Mickaël Laventure
cdbe1d05f8 Merge pull request #242 from mYmNeo/uninstall
Add uninstall target
2016-05-18 09:24:00 -07:00
thomassong
1f4c441d17 add uninstall target
Signed-off-by: thomassong <thomassong@tencent.com>
2016-05-18 09:19:45 +08:00
Kenfe-Mickael Laventure
496007897f Remove unneeded compilation when running test
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-05-13 11:44:33 -07:00
Michael Crosby
8dbbb0fa05 Remove govet
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-04-07 10:40:09 -07:00
Michael Crosby
6f18acda73 Remove dep on larger packages
This removes most of the deps on the larger packages for the shim and
reduces the binary size and memory footprint from a 7.1mb binary to a
2.6mb binary.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-04-06 11:21:49 -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
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
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
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
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
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
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
fe38efda50 Add shim for reattach of processes
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Remove runtime files from containerd

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

Update supervisor for orphaned containers

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

Remove ctr/container.go back to rpc calls

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

Add attach to loaded container

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

Add monitor based on epoll for process exits

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

Convert pids in containerd to string

This is so that we no longer care about linux or system level pids and
processes in containerd have user defined process id(pid) kinda like the
exec process ids that docker has today.

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

Add reaper back to containerd

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

Implement list containers with new process model

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

Implement restore of processes

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

Add NONBLOCK to exit fifo open

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

Implement tty reattach

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

Fix race in exit pipe creation

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

Add delete to shim

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

Update shim to use pid-file and not stdout

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-02-02 16:00:22 -08:00
Michael Crosby
fe506d51ef Remove vet and lint in validate
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-01-22 10:47:06 -08:00
Michael Crosby
b4a53af927 Merge pull request #65 from LK4D4/vendor
Vendor dependencies
2016-01-22 10:46:16 -08:00
Alexander Morozov
bba05d5748 Update Makefile to use vendor dir
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-01-22 08:30:39 -08:00
Phil Estes
03177bf053 Add dependency on the container build for steps doing "run"
Make sure that the container is actually built before commands in the
Makefile that require doing `docker run` on the devel container.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2016-01-12 14:56:07 -08:00
Jessica Frazelle
5b3f41c244
add dockerfile/makefile additions for ci
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-18 09:18:14 -08:00
Michael Crosby
15080cda61 Add logging to runc runtime
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-12-11 13:59:19 -08:00
Alexander Morozov
59a595c69f Add protoc target to makefile
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-12-11 12:08:02 -08:00
Michael Crosby
e87f8336c4 Add more client methods
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-12-08 13:31:20 -08:00
Michael Crosby
c0263b6b70 Make root makefile
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-12-08 11:37:55 -08:00