Skip to content

move defaultCaps to validate #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrunalp merged 1 commit into from
Jul 26, 2016
Merged

move defaultCaps to validate #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions cmd/ocitools/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (

"github.com/Sirupsen/logrus"
"github.com/blang/semver"
"github.com/opencontainers/ocitools/generate"
rspec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/urfave/cli"
)
Expand Down Expand Up @@ -47,6 +46,22 @@ var (
"RLIMIT_RTPRIO",
"RLIMIT_RTTIME",
}
defaultCaps = []string{
"CAP_CHOWN",
"CAP_DAC_OVERRIDE",
"CAP_FSETID",
"CAP_FOWNER",
"CAP_MKNOD",
"CAP_NET_RAW",
"CAP_SETGID",
"CAP_SETUID",
"CAP_SETFCAP",
"CAP_SETPCAP",
"CAP_NET_BIND_SERVICE",
"CAP_SYS_CHROOT",
"CAP_KILL",
"CAP_AUDIT_WRITE",
}
)

var bundleValidateCommand = cli.Command{
Expand Down Expand Up @@ -421,7 +436,7 @@ func envValid(env string) bool {
}

func capValid(capability string) bool {
for _, val := range generate.DefaultCaps {
for _, val := range defaultCaps {
if val == capability {
return true
}
Expand Down
21 changes: 0 additions & 21 deletions generate/default.go
View file
Open in desktop

This file was deleted.