Commit Graph

235 Commits

Author SHA1 Message Date
Michael Crosby
f3a5b8c0a9 Add command to generate man pages
The climan package has a command that can be registered with any urfav
cli app to generate man pages.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-09-11 15:31:02 -04:00
Derek McGowan
3db5a5ad2e Fix darwin build for cri release
Split release target for cri

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-09-10 16:38:33 -07:00
Lantao Liu
e3abd03ae1 Fix CRI release build.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-09 16:09:25 -07:00
Lantao Liu
61f113e608 Automate CRI tarball release.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-09 10:48:52 -07:00
Justin Terry (VM)
4b5dfaee13 Completely remove Windows v2 in-tree shim
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-08-05 16:49:56 -07:00
Wei Fu
b72673fdc7 Makefile: allow custom base path to install
for example, `make DESTDIR=/usr install`.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2019-07-17 09:26:25 -04:00
Michael Crosby
e4bfab7182 Merge pull request #3417 from dmcgowan/testing-log-hook
Add unit test logging hook
2019-07-16 15:11:12 -04:00
Derek McGowan
f63eab32e1 Add testing log hook to context
Allows log output to sent along with test output
for cleaner output and clearer ordering.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-07-16 10:31:43 -07:00
Maksym Pavlenko
2b521e25a7 Switch to golangci-lint
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-07-14 20:49:28 -07:00
Mattias Appelgren
650a7e5c1e Add hashsum for release archives
Signed-off-by: Mattias Appelgren <mattias@ppelgren.se>
2019-06-25 21:00:09 +02:00
Georgi Sabev
d5b770aa87 Introduce 'clean-test' target in Makefile
When tests fail they could leave debris behind such as
- overlay mounts
- cgroups
- metadata
These debris can cause subsequent tests to fail

Co-authored-by: Danail Branekov <danailster@gmail.com>
Signed-off-by: Georgi Sabev <georgethebeatle@gmail.com>
2019-04-05 17:17:03 +03:00
Sebastiaan van Stijn
b858cfb41b Makefile: allow overriding package name
With this patch applied, the package-name in the `--version` output can be overridden;

    make PACKAGE=containerd.io binaries

    ./bin/containerd --version
    containerd containerd.io v1.2.0-329-ga15b6e20.m a15b6e2097c48b632dbdc63254bad4c62b69e709.m

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-14 11:38:13 +01:00
Michael Crosby
84a24711e8 Add runc.v2 multi-shim
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-02-21 11:09:46 -05:00
Michael Crosby
5abeeff84f Merge pull request #2647 from teawater/gdb
Add build option "GODEBUG=1"
2019-01-29 12:04:05 -05:00
Sebastiaan van Stijn
897afeaf35 Revert "Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)"
This reverts commit 52de371700.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-12-19 19:05:30 +01:00
Sebastiaan van Stijn
52de371700 Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)
Attempt to fix CI is failing due to a regression in Go 1.10.6 / 1.11.3 (see https://github.com/golang/go/issues/29241)

```
package github.com/containernetworking/plugins/...: github.com/containernetworking/plugins/...: invalid import path: malformed import path "github.com/containernetworking/plugins/...": double dot
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-12-14 15:35:10 +01:00
Justin Terry (VM)
7d70d2b78d Fix Makefile to run protobuild on paths with spaces
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-11-05 09:08:48 -08:00
Phil Estes
0dd3211a06 Remove containerd-release tool from main repo
The release-tool is now located in the `containerd/project` repo.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-10-19 12:13:38 -04:00
Hui Zhu
c5a0c7f491 Add build option "GODEBUG=1"
Make will generate GDB friendly binary with this build option.

Signed-off-by: Hui Zhu <teawater@hyper.sh>
2018-09-19 16:13:42 +08:00
Justin Terry (VM)
019b0c34de Introduce containerd-shim-runhcs-v1 on Windows
Implements the containerd-shim-runhcs-v1 shim on Windows for the runtime
v2 shim API.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-08-22 08:15:43 -07:00
Aleksa Sarai
7aa132ffc7 docs: man: rename config.toml(5) to be more descriptive
The man page namespace is global, so in order to avoid colliding with
other man pages named "config.toml" rename ours to be more descriptive.
This also helps with discoverability (now tab-completion of 'man
containerd<tab>' will return the config man page), as well as making it
much cleaner from the perspective of distributions that want to package
containerd.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
2018-08-08 18:33:29 +10:00
Michael Crosby
da1b5470cd Runtime v2
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-07-17 10:21:29 -04:00
Derek McGowan
5bd99af7db Merge pull request #2097 from Random-Liu/vendor-cri-plugin
Vendor cri plugin into containerd.
2018-02-23 13:55:13 -08:00
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
Lantao Liu
809a99a39e Vendor cri plugin and add critest
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-16 23:23:47 +00: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