diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-14 20:13:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-14 20:13:28 +0100 |
| commit | 7e713ff336b8dd48b6fd75b16c92e6a35579355d (patch) | |
| tree | 84a9d3e1a7520aa34e8ecb1b49adf3aac5636694 /pkg/spec/security.go | |
| parent | 0668483cf04bc7089ed176fb0b6700aebf80aaf9 (diff) | |
| parent | 85b7374491e842c44bec3ce5ec800794cae10295 (diff) | |
| download | podman-7e713ff336b8dd48b6fd75b16c92e6a35579355d.tar.gz podman-7e713ff336b8dd48b6fd75b16c92e6a35579355d.tar.bz2 podman-7e713ff336b8dd48b6fd75b16c92e6a35579355d.zip | |
Merge pull request #5209 from vrothberg/un-docker
Undocker part 1)
Diffstat (limited to 'pkg/spec/security.go')
| -rw-r--r-- | pkg/spec/security.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/spec/security.go b/pkg/spec/security.go index 372fe87c6..3bad9f97a 100644 --- a/pkg/spec/security.go +++ b/pkg/spec/security.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/containers/libpod/libpod" - "github.com/docker/docker/oci/caps" + "github.com/containers/libpod/pkg/capabilities" "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" @@ -118,7 +118,7 @@ func (c *SecurityConfig) ConfigureGenerator(g *generate.Generator, user *UserCon if useNotRoot(user.User) { configSpec.Process.Capabilities.Bounding = caplist } - caplist, err = caps.TweakCapabilities(configSpec.Process.Capabilities.Bounding, c.CapAdd, c.CapDrop, nil, false) + caplist, err = capabilities.MergeCapabilities(configSpec.Process.Capabilities.Bounding, c.CapAdd, c.CapDrop) if err != nil { return err } @@ -129,7 +129,7 @@ func (c *SecurityConfig) ConfigureGenerator(g *generate.Generator, user *UserCon configSpec.Process.Capabilities.Effective = caplist configSpec.Process.Capabilities.Ambient = caplist if useNotRoot(user.User) { - caplist, err = caps.TweakCapabilities(bounding, c.CapAdd, c.CapDrop, nil, false) + caplist, err = capabilities.MergeCapabilities(bounding, c.CapAdd, c.CapDrop) if err != nil { return err } |