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

Merge pull request #4815 from AkihiroSuda/remove-apparmor-tag

Browse Source 
remove "apparmor" build tag
This commit is contained in:
Phil Estes 2020-12-08 09:11:17 -05:00 committed by GitHub
commit 1e624fa3de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BUILDING.md
View File

@ -107,7 +107,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.
> * `apparmor`: Enables apparmor support in the cri plugin
> * `selinux`: Enables selinux support in the cri plugin > * `selinux`: Enables selinux support in the cri plugin
> >
> For example, adding `BUILDTAGS=no_btrfs` to your environment before calling the **binaries** > For example, adding `BUILDTAGS=no_btrfs` to your environment before calling the **binaries**

4
Makefile
View File

@ -77,8 +77,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 apparmor and selinux are needed by CRI plugin. # Build tag "selinux" is needed by CRI plugin.
GO_BUILDTAGS ?= apparmor selinux GO_BUILDTAGS ?= 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)'

2
pkg/apparmor/apparmor.go
View File

@ -1,4 +1,4 @@
// +build apparmor,linux // +build linux
/* /*
Copyright The containerd Authors. Copyright The containerd Authors.

2
pkg/apparmor/apparmor_unsupported.go
View File

@ -1,4 +1,4 @@
// +build !apparmor !linux // +build !linux
/* /*
Copyright The containerd Authors. Copyright The containerd Authors.