From 8f418f1568b2735fdeea9a84afc354e1f8cbc94c Mon Sep 17 00:00:00 2001 From: TomSweeneyRedHat Date: Wed, 13 Mar 2019 11:40:24 -0400 Subject: Vendor docker/docker, fsouza and more #2 Signed-off-by: TomSweeneyRedHat 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. --- libpod/container_api.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libpod') 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" -- cgit v1.2.3-54-g00ecf