github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

remove seccomp buildtag

Browse Source 
The cgo dependency on libseccomp was removed in containerd/cri#1548.

The `seccomp` build tag is now ignored (and the seccomp support is always built-in).

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2020-07-31 14:25:56 +09:00
parent 362b7167a7
commit 6988b4d640
No known key found for this signature in database
GPG Key ID: 49524C6F9F638F1A
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BUILDING.md
View File

@ -17,7 +17,6 @@ To build the `containerd` daemon, and the `ctr` simple test client, the followin
* Go 1.13.x or above except 1.14.x * Go 1.13.x or above except 1.14.x
* Protoc 3.x compiler and headers (download at the [Google protobuf releases page](https://github.com/google/protobuf/releases)) * Protoc 3.x compiler and headers (download at the [Google protobuf releases page](https://github.com/google/protobuf/releases))
* Btrfs headers and libraries for your distribution. Note that building the btrfs driver can be disabled via the build tag `no_btrfs`, removing this dependency. * Btrfs headers and libraries for your distribution. Note that building the btrfs driver can be disabled via the build tag `no_btrfs`, removing this dependency.
* `libseccomp` is required if you're building with seccomp support
## Build the development environment ## Build the development environment
@ -46,11 +45,6 @@ need to satisfy this dependencies in your system:
* Debian Buster/Ubuntu 19.10: * Debian Buster/Ubuntu 19.10:
`apt-get install btrfs-progs libbtrfs-dev` `apt-get install btrfs-progs libbtrfs-dev`
If you're building with seccomp, you'll need to install it with the following:
* CentOS/Fedora: `yum install libseccomp-devel`
* Debian/Ubuntu: `apt install libseccomp-dev`
At this point you are ready to build `containerd` yourself! At this point you are ready to build `containerd` yourself!
## Build runc ## Build runc
@ -107,7 +101,6 @@ make generate
> * `no_cri`: A build tag disables building Kubernetes [CRI](http://blog.kubernetes.io/2016/12/container-runtime-interface-cri-in-kubernetes.html) support into containerd. > * `no_cri`: A build tag disables building Kubernetes [CRI](http://blog.kubernetes.io/2016/12/container-runtime-interface-cri-in-kubernetes.html) support into containerd.
> See [here](https://github.com/containerd/cri-containerd#build-tags) for build tags of CRI plugin. > See [here](https://github.com/containerd/cri-containerd#build-tags) for build tags of CRI plugin.
> * `no_devmapper`: A build tag disables building the device mapper snapshot driver. > * `no_devmapper`: A build tag disables building the device mapper snapshot driver.
> * `seccomp`: Enables seccomp support in the cri plugin
> * `apparmor`: Enables apparmor support in the cri plugin > * `apparmor`: Enables apparmor support in the cri plugin
> * `selinux`: Enables selinux support in the cri plugin > * `selinux`: Enables selinux support in the cri plugin
> >
@ -143,7 +136,7 @@ You can build an image from this `Dockerfile`:
FROM golang FROM golang
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y libbtrfs-dev libseccomp-dev apt-get install -y libbtrfs-dev
``` ```
Let's suppose that you built an image called `containerd/build`. From the Let's suppose that you built an image called `containerd/build`. From the

4
Makefile
View File

@ -93,8 +93,8 @@ MANPAGES=ctr.8 containerd.8 containerd-config.8 containerd-config.toml.5
ifdef BUILDTAGS ifdef BUILDTAGS
GO_BUILDTAGS = ${BUILDTAGS} GO_BUILDTAGS = ${BUILDTAGS}
endif endif
# Build tags seccomp, apparmor and selinux are needed by CRI plugin. # Build tags apparmor and selinux are needed by CRI plugin.
GO_BUILDTAGS ?= seccomp apparmor selinux GO_BUILDTAGS ?= apparmor selinux
GO_BUILDTAGS += ${DEBUG_TAGS} GO_BUILDTAGS += ${DEBUG_TAGS}
GO_TAGS=$(if $(GO_BUILDTAGS),-tags "$(GO_BUILDTAGS)",) GO_TAGS=$(if $(GO_BUILDTAGS),-tags "$(GO_BUILDTAGS)",)
GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) $(EXTRA_LDFLAGS)' GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) $(EXTRA_LDFLAGS)'