Skip to content

Commit

Permalink
Merge pull request containerd#1443 from dims/build-runc-with-selinux-…
Browse files Browse the repository at this point in the history
…support

Build runc with selinux support
  • Loading branch information
mikebrow committed Apr 15, 2020
2 parents d531dc4 + 2b162b6 commit 6e980b9
Show file tree
Hide file tree
Showing 12 changed files with 415 additions and 246 deletions.
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -31,7 +31,7 @@ VERSION := $(shell git rev-parse --short HEAD)
TARBALL_PREFIX := cri-containerd
TARBALL := $(TARBALL_PREFIX)-$(VERSION).$(GOOS)-$(GOARCH).tar.gz
ifneq ($(GOOS),windows)
BUILD_TAGS := seccomp apparmor
BUILD_TAGS := seccomp apparmor selinux
endif
# Add `-TEST` suffix to indicate that all binaries built from this repo are for test.
GO_LDFLAGS := -X $(PROJECT)/vendor/github.com/containerd/containerd/version.Version=$(VERSION)-TEST
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -102,7 +102,7 @@ testing purposes. The version tag carries the suffix "-TEST".*
To add build tags to the make option the `BUILD_TAGS` variable must be set.

```bash
make BUILD_TAGS='seccomp apparmor'
make BUILD_TAGS='seccomp apparmor selinux'
```

| Build Tag | Feature | Dependency |
Expand Down
2 changes: 1 addition & 1 deletion hack/install/utils.sh
Expand Up @@ -32,7 +32,7 @@ if ${NOSUDO}; then
fi

# BUILDTAGS are bulid tags for runc and containerd.
BUILDTAGS=${BUILDTAGS:-seccomp apparmor}
BUILDTAGS=${BUILDTAGS:-seccomp apparmor selinux}

# checkout_repo checks out specified repository
# and switch to specified version.
Expand Down
2 changes: 1 addition & 1 deletion vendor.conf
@@ -1,7 +1,7 @@
# cri dependencies
github.com/docker/distribution 0d3efadf0154c2b8a4e7b6621fff9809655cc580
github.com/docker/docker 4634ce647cf2ce2c6031129ccd109e557244986f
github.com/opencontainers/selinux 31f70552238c5e017d78c3f1ba65e85f593f48e0 # v1.3.3
github.com/opencontainers/selinux 0d49ba2a6aae052c614dfe5de62a158711a6c461 # v1.5.1
github.com/tchap/go-patricia 666120de432aea38ab06bd5c818f04f4129882c9 # v2.2.6

# containerd dependencies
Expand Down
134 changes: 51 additions & 83 deletions vendor/github.com/opencontainers/selinux/go-selinux/label/label.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6e980b9

Please sign in to comment.