From a73db3dc5c8478ab3c600b1f1c892c3c4b664eb9 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 6 Aug 2014 13:07:07 -0600 Subject: [PATCH] Update hack/vendor.sh to use libcontainer's update-vendor.sh script as the source of truth for libcontainer deps and not include them in Docker's repo twice Signed-off-by: Andrew Page Upstream-commit: 5101173e1fa5616768cb7a1b07f6c911f0f63658 Component: engine --- components/engine/hack/vendor.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/engine/hack/vendor.sh b/components/engine/hack/vendor.sh index a710415659..003dfec59b 100755 --- a/components/engine/hack/vendor.sh +++ b/components/engine/hack/vendor.sh @@ -45,8 +45,6 @@ clone git github.com/gorilla/context 14f550f51a clone git github.com/gorilla/mux 136d54f81f -clone git github.com/syndtr/gocapability 3c85049eae - clone git github.com/tchap/go-patricia v1.0.1 clone hg code.google.com/p/go.net 84a4013f96e0 @@ -61,6 +59,8 @@ rm -rf src/code.google.com/p/go mkdir -p src/code.google.com/p/go/src/pkg/archive mv tmp-tar src/code.google.com/p/go/src/pkg/archive/tar -clone git github.com/godbus/dbus v1 -clone git github.com/coreos/go-systemd v2 clone git github.com/docker/libcontainer 5589d4d879f1d7e31967a927d3e8b98144fbe06b +# see src/github.com/docker/libcontainer/update-vendor.sh which is the "source of truth" for libcontainer deps (just like this file) +rm -rf src/github.com/docker/libcontainer/vendor +eval "$(grep '^clone ' src/github.com/docker/libcontainer/update-vendor.sh | grep -v 'github.com/codegangsta/cli')" +# we exclude "github.com/codegangsta/cli" here because it's only needed for "nsinit", which Docker doesn't include