diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-13 10:14:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-13 10:14:09 -0700 |
| commit | 1fa664166571ab7dd3abe1b0d64ae9a81a8688ae (patch) | |
| tree | fc6b218409181bbe49c7c315bcba16ab160d49f4 /pkg | |
| parent | 8b3f759800ebd6e53e0a807728ede633aa9bdb36 (diff) | |
| parent | 8f418f1568b2735fdeea9a84afc354e1f8cbc94c (diff) | |
| download | podman-1fa664166571ab7dd3abe1b0d64ae9a81a8688ae.tar.gz podman-1fa664166571ab7dd3abe1b0d64ae9a81a8688ae.tar.bz2 podman-1fa664166571ab7dd3abe1b0d64ae9a81a8688ae.zip | |
Merge pull request #2628 from TomSweeneyRedHat/dev/tsweeney/bigvendorbuildah2
Vendor docker/docker, fsouza and more #2
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/spec/spec.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go index 32d47732b..a61741f73 100644 --- a/pkg/spec/spec.go +++ b/pkg/spec/spec.go @@ -9,7 +9,7 @@ import ( "github.com/containers/libpod/pkg/rootless" "github.com/containers/storage/pkg/mount" pmount "github.com/containers/storage/pkg/mount" - "github.com/docker/docker/daemon/caps" + "github.com/docker/docker/oci/caps" "github.com/docker/go-units" "github.com/opencontainers/runc/libcontainer/user" spec "github.com/opencontainers/runtime-spec/specs-go" @@ -625,7 +625,7 @@ func setupCapabilities(config *CreateConfig, configSpec *spec.Spec) error { if useNotRoot(config.User) { configSpec.Process.Capabilities.Bounding = caplist } - caplist, err = caps.TweakCapabilities(configSpec.Process.Capabilities.Bounding, config.CapAdd, config.CapDrop) + caplist, err = caps.TweakCapabilities(configSpec.Process.Capabilities.Bounding, config.CapAdd, config.CapDrop, nil, false) if err != nil { return err } @@ -636,7 +636,7 @@ func setupCapabilities(config *CreateConfig, configSpec *spec.Spec) error { configSpec.Process.Capabilities.Effective = caplist configSpec.Process.Capabilities.Ambient = caplist if useNotRoot(config.User) { - caplist, err = caps.TweakCapabilities(bounding, config.CapAdd, config.CapDrop) + caplist, err = caps.TweakCapabilities(bounding, config.CapAdd, config.CapDrop, nil, false) if err != nil { return err } |