Merge pull request #8979 from BenTheElder/no-docker-contrib

remove unused vendor/github.com/docker/docker/contrib
kubernetes · Aug 8, 2018 · 8d413f7 · 8d413f7
2 parents edb3178 + 3417235
commit 8d413f7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 701 deletions.
diff --git a/hack/update-deps.sh b/hack/update-deps.sh
@@ -37,8 +37,13 @@ trap 'echo "FAILED" >&2' ERR
 rm -rf vendor/github.com/golang/dep/internal/fs/testdata
 # go-bindata does too, and is not maintained ...
 rm -rf vendor/github.com/jteeuwen/go-bindata/testdata
+# docker has a contrib dir with nothing we use in it, dep will retain the licenses
+# which includes some GPL, so we manually prune this. 
+# See https://github.com/kubernetes/steering/issues/57
+rm -rf vendor/github.com/docker/docker/contrib
 bazel run //:dep -- ensure -v "$@"
 rm -rf vendor/github.com/golang/dep/internal/fs/testdata
 rm -rf vendor/github.com/jteeuwen/go-bindata/testdata
+rm -rf vendor/github.com/docker/docker/contrib
 hack/update-bazel.sh
 echo SUCCESS
diff --git a/vendor/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/LICENSE b/vendor/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/LICENSE