Commit Graph

111 Commits

Author SHA1 Message Date
Kunal Kushwaha
b12c3215a0 Licence header added
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2018-02-19 10:32:26 +09:00
Phil Estes
8f183b5ee9 Add basic manpages for ctr, containerd, containerd-config
Adds initial manpages for ctr, containerd, and containerd config
commands, as well as the config.toml configuration file.

Adds targets to Makefile for generating and installing manpages.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-02-14 15:17:31 -05:00
Phil Estes
fc1913a5a6 Add capability to build manpages from markdown
Adds capability to build the manpages via the go-md2man utility to the
make framework for containerd

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-01-30 19:50:45 -05:00
Phil Estes
e78c77fd2b Add Golang issue link re: -trimpath to Makefile
Per the request in #2021, add a link to the issue in case this situation
changes in the future.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-01-22 15:30:31 -05:00
Michael Crosby
e9432a7900 Merge pull request #2021 from kunalkushwaha/trimpath
trim code path in stack trace.
2018-01-22 15:25:11 -05:00
Stephen J Day
fe5da18f70 Makefile: ensure that containerd-shim gets added when installing
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-01-22 11:48:27 -08:00
Kunal Kushwaha
ad4f265497 trim code path in stack trace.
Added -trimpath flag in -gcflags to reduce codepath in stack trace.
Fixes #2000

In case of multiple GOPATH, it will trimpath of first one

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2018-01-22 11:03:49 +09:00
Lucas Molas
5fd9904684 Revert "Add go build option '-i' only for native builds"
Signed-off-by: Lucas Molas <lmolas@fundacionsadosky.org.ar>
2018-01-10 12:54:42 -03:00
Daniel Nephin
ebbcececa1 Remove DCO check from makefile, move to .travis.yml
The DCO check is primarily only relevant as part of CI, so it
doesn't need to be in the Makefile. A contributor looking to
validate their commits can run script/validate/dco.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2018-01-08 18:35:15 -05:00
Stephen J Day
1c8911b1f1 Makefile: no need to calculate GOOS
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-01-04 17:30:01 -08:00
Lucas Molas
55b5e356de Added go build option '-i' only for native builds
Signed-off-by: Lucas Molas <lmolas@fundacionsadosky.org.ar>
2017-12-20 17:00:47 -03:00
Daniel Nephin
cc9216c1dd Remove go install from Makefile
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-12-18 11:17:24 -05:00
Daniel Nephin
274ce69f93 Less verbose build output
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-12-15 16:41:28 -05:00
Michael Crosby
96e2f30250 Merge pull request #1759 from dnephin/single-integration-target
Remove duplicate integration target
2017-11-21 10:57:22 -05:00
Michael Crosby
434f0e679f Compile shim without cgo for size and mem usage
This compiles the shim without cgo and statically which ends up to have
lower memory usage and binary size.  buildmode=pie cannot be used
without cgo.

ref: https://github.com/golang/go/issues/17789#issuecomment-258542220

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-11-17 17:32:49 -05:00
Daniel Nephin
4df7075a74 Remove integration-parallel target
Always run in parallel. The old target can be emulated with

TESTFLAGS_PARALLEL=1 make integration

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-11-16 11:15:33 -05:00
Daniel Nephin
d8cf30e42e Reduce number of blobs in TestWalkBlobs
Reduce runtime from 170s to 3s

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-11-14 17:51:44 -05:00
Daniel Nephin
b28e1eee42 Fix coverage report
Previously the coverage.txt file was never populated

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-11-14 12:47:48 -05:00
Michael Crosby
01cdf330bb Merge pull request #1716 from crosbymichael/strip
Strip binaries in Makefile
2017-11-07 10:44:47 -05:00
Daniel Nephin
f9e969bac8 Use gometalinter for linting
gometalinter runs linters in parallel for faster linting
it provides a uniform way of whitelisting lines using // nolint or the exclude
field in the config

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-11-03 18:02:27 -04:00
Michael Crosby
a045575998 Strip binaries in Makefile
This will make the binaries around 8MB smaller.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-11-03 11:44:41 -04:00
Michael Crosby
b8c4d85564 Add buildmode=pie to makefile
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-26 16:25:30 -04:00
Michael Crosby
769d9e16bd add release tool to generate releases
This tool makes our standard release template easy to generate.  It also
adds a few features like marking changed dependnencies for packages and
others to know what updated from the last release.

usage:
`containerd-release -n releases/v1.0.0-beta.2.toml`

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-11 18:51:13 -04:00
Stephen J Day
363d692f35 api/services: define the introspection API
After several requests for information about platform support,
configuration introspection and feature switches, we now have a solution
that should work in all these use cases. The Introspection API hooks
into the plugin subsystem registration process. During registration,
plugins declare several pieces of information, allowing clients to
discover the cababilities and support that a containerd instance
provides, including whether or not it loaded with an error.

To allow symmetrical error reporting, the `google/rpc.Status` protobuf
definitions have been brought in from the googleapis project.
Unfortunately, we had to generate these in place to match our protobuf
system.

Once we like this design, we can add an implementation to integrate it
directly with the plugin system.

Enjoy!

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-10-10 16:40:47 -07:00
Stephen J Day
157cfb1ad2 api, linux/runcopts: ensure output is current
Ensure that the descriptors are re-generated on the CI and block merges
that don't include updates. We also enable the `check-protos` check as
part of this process. The installation process for protobufs has been
fixed to support protobuild.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-09-06 14:51:53 -07:00
Kenfe-Mickael Laventure
700120c066 Don't build binaries when running make vet
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-08-29 08:27:44 -07:00
Kunal Kushwaha
1c989588c0 Breaking Makefile into platform specific files
Fixed #1270

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2017-08-22 13:57:12 +09:00
Akihiro Suda
f8b1f4f6dc stress -> containerd-stress
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-08-15 14:54:20 +00:00
Kenfe-Mickael Laventure
eb0970bbd1 Mark relevant tests as elligible for parallelism
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-08-14 14:43:43 -07:00
Michael Crosby
fd75f1e52f Add stress test tool
This adds a `stress` binary to help stress test containerd.  It is
different from a benchmarking tool as it only gives a simple summary at
the end.

It is built to run long, multi hour/day stress tests across builds of
containerd.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-10 15:46:10 -04:00
Stephen J Day
7717eb6feb Makefile: simplify installation from tar file
By moving the binaries to be rooted at `bin/` in the tar file,
installation can be done from a tar file in one fell swoop:

```console
$ make release
$ sudo tar -C /usr/local -xvf releases/containerd-1.0.0-alpha3-72-ge6ba48f2.m.linux-amd64.tar.gz
```

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-08-09 18:35:29 -07:00
Edward Pilatowicz
56c1f5c184 Add solaris build support
Signed-off-by: Edward Pilatowicz <edward.pilatowicz@oracle.com>
2017-08-07 12:40:21 -07:00
Stephen Day
dd7642fc1c Merge pull request #1196 from mlaventure/update-windows-runtime
Update windows runtime
2017-07-21 15:12:53 -07:00
Derek McGowan
a621185855 Merge pull request #1179 from AkihiroSuda/makefile-i
Makefile: `go build -i` -> `go build`
2017-07-21 10:02:22 -07:00
Kenfe-Mickael Laventure
eb4e0b5fb1 Add AppVeyor configuration
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
79d04ded4e Make integration a bit more verbose
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-07-21 18:19:51 +02:00
Stephen J Day
88656970c5 Makefile: add release target
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-07-19 16:03:43 -07:00
Stephen J Day
e3a07b5673 Makefile: no need to build protos binary
For the standard make target, there is no need to build the protoc
plugin binary. This can be built automatically in response to the `make
protos` target.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-07-18 17:16:03 -07:00
Stephen J Day
98f6deb50e cmd/dist: completely remove dist command
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-07-14 15:48:39 -07:00
Stephen J Day
6c925924db protobuild: replace protobuild command
To make the protobuild tool broadly useful, it has been broken out into
a separate project. This PR replaces the command with a configuration
file.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-07-14 14:10:06 -07:00
Akihiro Suda
f72e97dbf8 Makefile: go build -i -> go build
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-07-13 10:31:49 +00:00
Akihiro Suda
eeb74d4e23 *_test.go: fix test conditions
- add `testutil.RequiresRoot()` to TestMain
- moved `if testing.Short{ t.Skip() }` from each of the tests into a
common `newClient()`

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-06-30 04:00:59 +00:00
Akihiro Suda
2c293429f3 Makefile: fix INTEGRATION_PACKAGE
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-06-29 06:50:36 +00:00
Michael Crosby
bcb04540fa Merge pull request #1074 from stevvooe/whale-no-more
Makefile: replace whale with D
2017-06-23 11:08:27 -07:00
Michael Crosby
99160a7ac0 Merge pull request #854 from AkihiroSuda/lookup-mountinfo
mountinfo: add Lookup for ease of implementing snapshotters
2017-06-22 20:14:39 -07:00
Stephen J Day
e3f919f1d2 Makefile: replace whale with D
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-06-22 19:25:01 -07:00
Michael Crosby
268ab7c053 Benchmark container create and task start
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-06-15 10:43:59 -07:00
Akihiro Suda
0ab2227377 mount: add mount.Lookup for ease of implementing snapshotters
`func Lookup(dir string) (Info, error)` returns the mount
info that corresponds to the dir

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-06-06 09:27:53 +00:00
Michael Crosby
b3f891b09f Add integration tests for running containers
Add travis support for running integration tests with the client package
and go test framework

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-05-26 15:50:01 -07:00
Michael Crosby
d7af92e00c Move Mount into mount pkg
This moves both the Mount type and mountinfo into a single mount
package.

This also opens up the root of the repo to hold the containerd client
implementation.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-05-22 16:41:12 -07:00