Add seccomp build tag

Add a seccomp build tag and also support in the Makefile to add or
remove build tags.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2015-08-21 15:25:26 -07:00
parent cd01b01018
commit a8e0185d97
4 changed files with 16 additions and 4 deletions

View File

@ -1,10 +1,11 @@
RUNC_TEST_IMAGE=runc_test
PROJECT=github.com/opencontainers/runc
TEST_DOCKERFILE=script/test_Dockerfile
BUILDTAGS=seccomp
export GOPATH:=$(CURDIR)/Godeps/_workspace:$(GOPATH)
all:
go build -o runc .
go build -tags "$(BUILDTAGS)" -o runc .
vet:
go get golang.org/x/tools/cmd/vet
@ -20,7 +21,8 @@ test: runctestimage
docker run -e TESTFLAGS --privileged --rm -v $(CURDIR):/go/src/$(PROJECT) $(RUNC_TEST_IMAGE) make localtest
localtest:
go test ${TESTFLAGS} -v ./...
go test -tags "$(BUILDTAGS)" ${TESTFLAGS} -v ./...
install:
cp runc /usr/local/bin/runc

View File

@ -29,6 +29,9 @@ make
sudo make install
```
In order to enable seccomp support you will need to install libseccomp on your platform.
If you do not with to build `runc` with seccomp support you can add `BUILDTAGS=""` when running make.
### Using:
To run a container, execute `runc start` in the bundle's root directory:

View File

@ -1,4 +1,4 @@
// +build linux,cgo
// +build linux,cgo,seccomp
package seccomp

View File

@ -1,12 +1,19 @@
// +build !linux !cgo
// +build !linux !cgo !seccomp
package seccomp
import (
"errors"
"github.com/opencontainers/runc/libcontainer/configs"
)
var ErrSeccompNotEnabled = errors.New("seccomp: config provided but seccomp not supported")
// Seccomp not supported, do nothing
func InitSeccomp(config *configs.Seccomp) error {
if config != nil {
return ErrSeccompNotEnabled
}
return nil
}