Skip to content

Commit

Permalink
Update hack/vendor.sh to use libcontainer's update-vendor.sh script a…
Browse files Browse the repository at this point in the history
…s the source of truth for libcontainer deps and not include them in Docker's repo twice

Signed-off-by: Andrew Page <admwiggin@gmail.com>
  • Loading branch information
tianon committed Aug 6, 2014
1 parent 6215422 commit 5101173
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions hack/vendor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

0 comments on commit 5101173

Please sign in to comment.