Remove Seccomp build tag to fix godep
Signed-off-by: Matthew Heon <mheon@redhat.com>
This commit is contained in:
parent
59264040bd
commit
a6b73dbc73
|
@ -55,13 +55,13 @@
|
|||
"ImportPath": "github.com/opencontainers/specs",
|
||||
"Rev": "5b31bb2b7771e5074a4eb14eca432da1ca5182d6"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/syndtr/gocapability/capability",
|
||||
"Rev": "e55e5833692b49e49a0073ad5baf7803f21bebf4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/seccomp/libseccomp-golang",
|
||||
"Rev": "1b506fc7c24eec5a3693cdcbed40d9c226cfc6a1"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/syndtr/gocapability/capability",
|
||||
"Rev": "e55e5833692b49e49a0073ad5baf7803f21bebf4"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
5
Makefile
5
Makefile
|
@ -1,11 +1,10 @@
|
|||
RUNC_TEST_IMAGE=runc_test
|
||||
PROJECT=github.com/opencontainers/runc
|
||||
TEST_DOCKERFILE=script/test_Dockerfile
|
||||
BUILD_TAGS=seccomp
|
||||
export GOPATH:=$(CURDIR)/Godeps/_workspace:$(GOPATH)
|
||||
|
||||
all:
|
||||
go build -tags $(BUILD_TAGS) -o runc .
|
||||
go build -o runc .
|
||||
|
||||
vet:
|
||||
go get golang.org/x/tools/cmd/vet
|
||||
|
@ -21,7 +20,7 @@ test: runctestimage
|
|||
docker run -e TESTFLAGS --privileged --rm -v $(CURDIR):/go/src/$(PROJECT) $(RUNC_TEST_IMAGE) make localtest
|
||||
|
||||
localtest:
|
||||
go test -tags $(BUILD_TAGS) $(TESTFLAGS) -v ./...
|
||||
go test ${TESTFLAGS} -v ./...
|
||||
|
||||
install:
|
||||
cp runc /usr/local/bin/runc
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// +build seccomp,linux,cgo
|
||||
// +build linux,cgo
|
||||
|
||||
package integration
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// +build linux,cgo,seccomp
|
||||
// +build linux,cgo
|
||||
|
||||
package seccomp
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// +build !linux !cgo !seccomp
|
||||
// +build !linux !cgo
|
||||
|
||||
package seccomp
|
||||
|
||||
|
|
Loading…
Reference in New Issue