diff options
| author | TomSweeneyRedHat <tsweeney@redhat.com> | 2019-03-13 11:40:24 -0400 |
|---|---|---|
| committer | TomSweeneyRedHat <tsweeney@redhat.com> | 2019-03-13 11:40:39 -0400 |
| commit | 8f418f1568b2735fdeea9a84afc354e1f8cbc94c (patch) | |
| tree | fc6b218409181bbe49c7c315bcba16ab160d49f4 /pkg | |
| parent | 8b3f759800ebd6e53e0a807728ede633aa9bdb36 (diff) | |
| download | podman-8f418f1568b2735fdeea9a84afc354e1f8cbc94c.tar.gz podman-8f418f1568b2735fdeea9a84afc354e1f8cbc94c.tar.bz2 podman-8f418f1568b2735fdeea9a84afc354e1f8cbc94c.zip | |
Vendor docker/docker, fsouza and more #2
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
Vendors in fsouza/docker-client, docker/docker and
a few more related. Of particular note, changes to the TweakCapabilities()
function from docker/docker along with the parse.IDMappingOptions() function
from Buildah. Please pay particular attention to the related changes in
the call from libpod to those functions during the review.
Passes baseline tests.
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 } |