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 /libpod | |
| 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 'libpod')
| -rw-r--r-- | libpod/container_api.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_api.go b/libpod/container_api.go index d74a14f15..d612341bc 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -11,8 +11,8 @@ import ( "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/libpod/events" + "github.com/containers/libpod/pkg/capabilities" "github.com/containers/storage/pkg/stringid" - "github.com/docker/docker/oci/caps" "github.com/opentracing/opentracing-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -237,7 +237,7 @@ func (c *Container) Exec(tty, privileged bool, env map[string]string, cmd []stri } if privileged || c.config.Privileged { - capList = caps.GetAllCapabilities() + capList = capabilities.AllCapabilities() } // Generate exec session ID |