Skip to content

Commit 564b30e

Browse files
author
Mrunal Patel
authored
Merge pull request #147 from Mashimiao/move-default-cap-to-validate
move defaultCaps to validate
2 parents 2928edb + 5f07d9d commit 564b30e

File tree

2 files changed

+17
-23
lines changed

2 files changed

+17
-23
lines changed

cmd/ocitools/validate.go

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616

1717
"github.com/Sirupsen/logrus"
1818
"github.com/blang/semver"
19-
"github.com/opencontainers/ocitools/generate"
2019
rspec "github.com/opencontainers/runtime-spec/specs-go"
2120
"github.com/urfave/cli"
2221
)
@@ -47,6 +46,22 @@ var (
4746
"RLIMIT_RTPRIO",
4847
"RLIMIT_RTTIME",
4948
}
49+
defaultCaps = []string{
50+
"CAP_CHOWN",
51+
"CAP_DAC_OVERRIDE",
52+
"CAP_FSETID",
53+
"CAP_FOWNER",
54+
"CAP_MKNOD",
55+
"CAP_NET_RAW",
56+
"CAP_SETGID",
57+
"CAP_SETUID",
58+
"CAP_SETFCAP",
59+
"CAP_SETPCAP",
60+
"CAP_NET_BIND_SERVICE",
61+
"CAP_SYS_CHROOT",
62+
"CAP_KILL",
63+
"CAP_AUDIT_WRITE",
64+
}
5065
)
5166

5267
var bundleValidateCommand = cli.Command{
@@ -421,7 +436,7 @@ func envValid(env string) bool {
421436
}
422437

423438
func capValid(capability string) bool {
424-
for _, val := range generate.DefaultCaps {
439+
for _, val := range defaultCaps {
425440
if val == capability {
426441
return true
427442
}

generate/default.go

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)