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 /libpod/container_api.go | |
| 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 'libpod/container_api.go')
| -rw-r--r-- | libpod/container_api.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/container_api.go b/libpod/container_api.go index 3698a15ec..33ec938f7 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -14,7 +14,7 @@ import ( "github.com/containers/libpod/pkg/inspect" "github.com/containers/libpod/pkg/lookup" "github.com/containers/storage/pkg/stringid" - "github.com/docker/docker/daemon/caps" + "github.com/docker/docker/oci/caps" opentracing "github.com/opentracing/opentracing-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" |