mirrors/binctr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "update to use containerd seccomp package"

Browse source 
This reverts commit 4f8e065faf055d3f0463a92622297ca3afac07f4.
This commit is contained in:
Jess Frazelle 2018-03-22 09:15:36 -04:00
parent 09243b740c
commit 60f032f6f5
8199 changed files with 1598219 additions and 30742 deletions
Download patch file Download diff file Expand all files Collapse all files

1654
container/seccomp.go Normal file
View file

File diff suppressed because it is too large Load diff

10
container/seccomp_unsupported.go Normal file
View file

@ -0,0 +1,10 @@
// +build !seccomp
package container
import (
specs "github.com/opencontainers/runtime-spec/specs-go"
)
// DefaultSeccompProfile defines the whitelist for the default seccomp profile.
var DefaultSeccompProfile = &specs.LinuxSeccomp{}

3
container/spec.go
View file

@ -1,7 +1,6 @@
package container
import (
"github.com/containerd/containerd/contrib/seccomp"
aaprofile "github.com/docker/docker/profiles/apparmor"
"github.com/opencontainers/runc/libcontainer/apparmor"
"github.com/opencontainers/runc/libcontainer/specconv"
@ -43,7 +42,7 @@ func Spec(opts SpecOpts) *specs.Spec {
spec.Hooks = opts.Hooks
// Set the default seccomp profile.
spec.Linux.Seccomp = seccomp.DefaultProfile(spec)
spec.Linux.Seccomp = DefaultSeccompProfile
// Install the default apparmor profile.
if apparmor.IsEnabled() {