Permalink
Browse files

Merge pull request #284 from runcom/switch-to-vndr

switch to vndr
  • Loading branch information...
2 parents bbc0c69 + fefeeb4 commit 9b6b57df503d8b3cc800195148f0e7cc2f5ab68a @runcom runcom committed on GitHub Jan 9, 2017
Showing with 4,339 additions and 40,235 deletions.
  1. +8 −8 README.md
  2. +0 −115 hack/.vendor-helpers.sh
  3. +11 −42 hack/vendor.sh
  4. +35 −0 vendor.conf
  5. +0 −1 vendor/github.com/Sirupsen/logrus/.gitignore
  6. +0 −9 vendor/github.com/Sirupsen/logrus/.travis.yml
  7. +0 −66 vendor/github.com/Sirupsen/logrus/CHANGELOG.md
  8. +0 −388 vendor/github.com/Sirupsen/logrus/README.md
  9. +19 −0 vendor/github.com/containers/storage/NOTICE
  10. +779 −0 vendor/github.com/containers/storage/drivers/windows/windows.go
  11. +0 −2 vendor/github.com/containers/storage/drivers/zfs/MAINTAINERS
  12. +26 −0 vendor/github.com/containers/storage/pkg/longpath/longpath.go
  13. +0 −27 vendor/github.com/containers/storage/pkg/mflag/LICENSE
  14. +188 −0 vendor/github.com/containers/storage/pkg/plugins/client.go
  15. +132 −0 vendor/github.com/containers/storage/pkg/plugins/discovery.go
  16. +33 −0 vendor/github.com/containers/storage/pkg/plugins/errors.go
  17. +270 −0 vendor/github.com/containers/storage/pkg/plugins/plugins.go
  18. +36 −0 vendor/github.com/containers/storage/pkg/plugins/transport/http.go
  19. +36 −0 vendor/github.com/containers/storage/pkg/plugins/transport/transport.go
  20. +0 −37 vendor/github.com/docker/distribution/.gitignore
  21. +0 −18 vendor/github.com/docker/distribution/.mailmap
  22. +0 −147 vendor/github.com/docker/distribution/AUTHORS
  23. +0 −119 vendor/github.com/docker/distribution/BUILDING.md
  24. +0 −35 vendor/github.com/docker/distribution/CHANGELOG.md
  25. +0 −140 vendor/github.com/docker/distribution/CONTRIBUTING.md
  26. +0 −18 vendor/github.com/docker/distribution/Dockerfile
  27. +0 −58 vendor/github.com/docker/distribution/MAINTAINERS
  28. +0 −106 vendor/github.com/docker/distribution/Makefile
  29. +0 −131 vendor/github.com/docker/distribution/README.md
  30. +0 −267 vendor/github.com/docker/distribution/ROADMAP.md
  31. +0 −89 vendor/github.com/docker/distribution/circle.yml
  32. +0 −7 vendor/github.com/docker/distribution/coverpkg.sh
  33. +19 −0 vendor/github.com/docker/docker/NOTICE
  34. +0 −339 vendor/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/LICENSE
  35. +0 −339 vendor/github.com/docker/docker/contrib/selinux-oraclelinux-7/docker-engine-selinux/LICENSE
  36. +0 −340 vendor/github.com/docker/docker/contrib/selinux/docker-engine-selinux/LICENSE
  37. +0 −22 vendor/github.com/docker/docker/contrib/syntax/vim/LICENSE
  38. +0 −27 vendor/github.com/docker/docker/pkg/mflag/LICENSE
  39. +0 −191 vendor/github.com/docker/docker/pkg/symlink/LICENSE.APACHE
  40. +0 −27 vendor/github.com/docker/docker/pkg/symlink/LICENSE.BSD
  41. +0 −14 vendor/github.com/docker/engine-api/types/versions/README.md
  42. 0 vendor/github.com/docker/go-connections/sockets/README.md
  43. +0 −13 vendor/github.com/docker/go-units/README.md
  44. +0 −11 vendor/github.com/docker/go-units/circle.yml
  45. +0 −13 vendor/github.com/docker/libtrust/CONTRIBUTING.md
  46. +0 −3 vendor/github.com/docker/libtrust/MAINTAINERS
  47. +0 −22 vendor/github.com/docker/libtrust/README.md
  48. +0 −20 vendor/github.com/ghodss/yaml/.gitignore
  49. +0 −7 vendor/github.com/ghodss/yaml/.travis.yml
  50. +0 −116 vendor/github.com/ghodss/yaml/README.md
  51. +0 −4 vendor/github.com/go-check/check/.gitignore
  52. +0 −3 vendor/github.com/go-check/check/.travis.yml
  53. +0 −20 vendor/github.com/go-check/check/README.md
  54. +0 −2 vendor/github.com/go-check/check/TODO
  55. +0 −44 vendor/github.com/golang/glog/README
  56. +0 −7 vendor/github.com/gorilla/context/.travis.yml
  57. +0 −7 vendor/github.com/gorilla/context/README.md
  58. +0 −7 vendor/github.com/gorilla/mux/.travis.yml
  59. +0 −7 vendor/github.com/gorilla/mux/README.md
  60. +0 −2 vendor/github.com/imdario/mergo/.travis.yml
  61. +0 −68 vendor/github.com/imdario/mergo/README.md
  62. +0 −1 vendor/github.com/mistifyio/go-zfs/.gitignore
  63. +0 −41 vendor/github.com/mistifyio/go-zfs/.travis.yml
  64. +0 −60 vendor/github.com/mistifyio/go-zfs/CONTRIBUTING.md
  65. +0 −54 vendor/github.com/mistifyio/go-zfs/README.md
  66. +0 −34 vendor/github.com/mistifyio/go-zfs/Vagrantfile
  67. +0 −1 vendor/github.com/mtrmac/gpgme/.gitignore
  68. +0 −13 vendor/github.com/mtrmac/gpgme/README.md
  69. +0 −12 vendor/github.com/opencontainers/go-digest/.pullapprove.yml
  70. +0 −4 vendor/github.com/opencontainers/go-digest/.travis.yml
  71. +0 −72 vendor/github.com/opencontainers/go-digest/CONTRIBUTING.md
  72. +0 −191 vendor/github.com/opencontainers/go-digest/LICENSE.code
  73. +0 −425 vendor/github.com/opencontainers/go-digest/LICENSE.docs
  74. +0 −7 vendor/github.com/opencontainers/go-digest/MAINTAINERS
  75. +0 −104 vendor/github.com/opencontainers/go-digest/README.md
  76. +17 −0 vendor/github.com/opencontainers/runc/NOTICE
  77. +32 −0 vendor/github.com/opencontainers/runc/libcontainer/nsenter/namespace.h
  78. +12 −0 vendor/github.com/opencontainers/runc/libcontainer/nsenter/nsenter.go
  79. +25 −0 vendor/github.com/opencontainers/runc/libcontainer/nsenter/nsenter_gccgo.go
  80. +5 −0 vendor/github.com/opencontainers/runc/libcontainer/nsenter/nsenter_unsupported.go
  81. +754 −0 vendor/github.com/opencontainers/runc/libcontainer/nsenter/nsexec.c
  82. +551 −0 vendor/github.com/opencontainers/runc/libcontainer/selinux/selinux.go
  83. +0 −2 vendor/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS
  84. +148 −0 vendor/github.com/opencontainers/runc/libcontainer/utils/cmsg.c
  85. +57 −0 vendor/github.com/opencontainers/runc/libcontainer/utils/cmsg.go
  86. +36 −0 vendor/github.com/opencontainers/runc/libcontainer/utils/cmsg.h
  87. +126 −0 vendor/github.com/opencontainers/runc/libcontainer/utils/utils.go
  88. +33 −0 vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go
  89. +0 −10 vendor/github.com/pborman/uuid/.travis.yml
  90. +0 −1 vendor/github.com/pborman/uuid/CONTRIBUTORS
  91. +0 −13 vendor/github.com/pborman/uuid/README.md
  92. +0 −24 vendor/github.com/pkg/errors/.gitignore
  93. +0 −11 vendor/github.com/pkg/errors/.travis.yml
  94. +0 −52 vendor/github.com/pkg/errors/README.md
  95. +0 −32 vendor/github.com/pkg/errors/appveyor.yml
  96. +0 −4 vendor/github.com/stretchr/testify/assert/assertion_forward.go.tmpl
  97. +0 −6 vendor/github.com/stretchr/testify/require/require.go.tmpl
  98. +0 −4 vendor/github.com/stretchr/testify/require/require_forward.go.tmpl
  99. +0 −23 vendor/github.com/urfave/cli/.travis.yml
  100. +0 −310 vendor/github.com/urfave/cli/CHANGELOG.md
  101. +0 −579 vendor/github.com/urfave/cli/README.md
  102. +0 −16 vendor/github.com/urfave/cli/appveyor.yml
  103. +0 −44 vendor/github.com/vbatts/tar-split/tar/asm/README.md
  104. +22 −0 vendor/golang.org/x/net/PATENTS
  105. +0 −7 vendor/gopkg.in/cheggaaa/pb.v1/.travis.yml
  106. +0 −176 vendor/gopkg.in/cheggaaa/pb.v1/README.md
  107. +0 −31 vendor/gopkg.in/yaml.v2/LICENSE.libyaml
  108. +0 −128 vendor/gopkg.in/yaml.v2/README.md
  109. +0 −33,876 vendor/k8s.io/kubernetes/Godeps/LICENSES
  110. +0 −21 vendor/k8s.io/kubernetes/docs/user-guide/update-demo/local/LICENSE.angular
  111. +0 −27 vendor/k8s.io/kubernetes/third_party/forked/json/LICENSE
  112. +0 −27 vendor/k8s.io/kubernetes/third_party/forked/reflect/LICENSE
  113. +0 −27 vendor/k8s.io/kubernetes/third_party/golang/LICENSE
  114. +0 −28 vendor/k8s.io/kubernetes/third_party/htpasswd/COPYING
  115. +0 −202 vendor/k8s.io/kubernetes/third_party/intemp/LICENSE
  116. +0 −19 vendor/k8s.io/kubernetes/third_party/pause/LICENSE
  117. +150 −0 vendor/k8s.io/kubernetes/third_party/protobuf/google/protobuf/compiler/plugin.proto
  118. +779 −0 vendor/k8s.io/kubernetes/third_party/protobuf/google/protobuf/descriptor.proto
  119. +0 −11 vendor/k8s.io/kubernetes/third_party/swagger-ui/LICENSE
View
@@ -151,22 +151,22 @@ CONTRIBUTING
### Dependencies management
-`skopeo` uses a custom bash script for dependencies management. This script is located at `hack/vendor.sh`.
+`skopeo` uses [`vndr`](https://github.com/LK4D4/vndr) for dependencies management.
In order to add a new dependency to this project:
-- add a new line to `hack/vendor.sh` (e.g. `clone git github.com/pkg/errors master`)
-- run `hack/vendor.sh`
+- add a new line to `vendor.conf` according to `vndr` rules (e.g. `github.com/pkg/errors master`)
+- run `vndr github.com/pkg/errors`
-In order to update an existing dependency (or more):
+In order to update an existing dependency:
-- update the relevant dependency line in `hack/vendor.sh`
-- run `hack/vendor.sh`
+- update the relevant dependency line in `vendor.conf`
+- run `vndr github.com/pkg/errors`
In order to test out new PRs from [containers/image](https://github.com/containers/image) to not break `skopeo`:
-- update `hack/vendor.sh`. Find out the `containers/image` dependency; update it to vendor from your own branch and your own repository fork (e.g. `clone git github.com/containers/image my-branch https://github.com/runcom/image`)
-- run `hack/vendor.sh`
+- update `vendor.conf`. Find out the `containers/image` dependency; update it to vendor from your own branch and your own repository fork (e.g. `github.com/containers/image my-branch https://github.com/runcom/image`)
+- run `vndr github.com/containers/image`
License
-
@@ -1,115 +0,0 @@
-#!/usr/bin/env bash
-
-PROJECT=github.com/projectatomic/skopeo
-
-# Downloads dependencies into vendor/ directory
-mkdir -p vendor
-
-original_GOPATH=$GOPATH
-export GOPATH="${PWD}/vendor:$GOPATH"
-
-find="/usr/bin/find"
-
-clone() {
- local delete_vendor=true
- if [ "x$1" = x--keep-vendor ]; then
- delete_vendor=false
- shift
- fi
-
- local vcs="$1"
- local pkg="$2"
- local rev="$3"
- local url="$4"
-
- : ${url:=https://$pkg}
- local target="vendor/src/$pkg"
-
- echo -n "$pkg @ $rev: "
-
- if [ -d "$target" ]; then
- echo -n 'rm old, '
- rm -rf "$target"
- fi
-
- echo -n 'clone, '
- case "$vcs" in
- git)
- git clone --quiet --no-checkout "$url" "$target"
- ( cd "$target" && git checkout --quiet "$rev" && git reset --quiet --hard "$rev" -- )
- ;;
- hg)
- hg clone --quiet --updaterev "$rev" "$url" "$target"
- ;;
- esac
-
- echo -n 'rm VCS, '
- ( cd "$target" && rm -rf .{git,hg} )
-
- if $delete_vendor; then
- echo -n 'rm vendor, '
- ( cd "$target" && rm -rf vendor Godeps/_workspace )
- fi
-
- echo done
-}
-
-clean() {
- # If $GOPATH starts with ./vendor, (go list) shows the short-form import paths for packages inside ./vendor.
- # So, reset GOPATH to the external value (without ./vendor), so that the grep -v works.
- local packages=($(GOPATH=$original_GOPATH go list -e ./... | grep -v "^${PROJECT}/vendor"))
- local platforms=( linux/amd64 linux/386 )
-
- local buildTags=( )
-
- echo
-
- echo -n 'collecting import graph, '
- local IFS=$'\n'
- local imports=( $(
- for platform in "${platforms[@]}"; do
- export GOOS="${platform%/*}";
- export GOARCH="${platform##*/}";
- go list -e -tags "$buildTags" -f '{{join .Deps "\n"}}' "${packages[@]}"
- go list -e -tags "$buildTags" -f '{{join .TestImports "\n"}}' "${packages[@]}"
- done | grep -vE "^${PROJECT}" | sort -u
- ) )
- # .TestImports does not include indirect dependencies, so do one more iteration.
- imports+=( $(
- go list -e -f '{{join .Deps "\n"}}' "${imports[@]}" | grep -vE "^${PROJECT}" | sort -u
- ) )
- imports=( $(go list -e -f '{{if not .Standard}}{{.ImportPath}}{{end}}' "${imports[@]}") )
- unset IFS
-
- echo -n 'pruning unused packages, '
- findArgs=(
- # This directory contains only .c and .h files which are necessary
- # -path vendor/src/github.com/mattn/go-sqlite3/code
- )
- for import in "${imports[@]}"; do
- [ "${#findArgs[@]}" -eq 0 ] || findArgs+=( -or )
- findArgs+=( -path "vendor/src/$import" )
- done
- local IFS=$'\n'
- local prune=( $($find vendor -depth -type d -not '(' "${findArgs[@]}" ')') )
- unset IFS
- for dir in "${prune[@]}"; do
- $find "$dir" -maxdepth 1 -not -type d -not -name 'LICENSE*' -not -name 'COPYING*' -exec rm -v -f '{}' ';'
- rmdir "$dir" 2>/dev/null || true
- done
-
- echo -n 'pruning unused files, '
- $find vendor -type f -name '*_test.go' -exec rm -v '{}' ';'
-
- echo done
-}
-
-# Fix up hard-coded imports that refer to Godeps paths so they'll work with our vendoring
-fix_rewritten_imports () {
- local pkg="$1"
- local remove="${pkg}/Godeps/_workspace/src/"
- local target="vendor/src/$pkg"
-
- echo "$pkg: fixing rewritten imports"
- $find "$target" -name \*.go -exec sed -i -e "s|\"${remove}|\"|g" {} \;
-}
View
53 hack/vendor.sh 100755 → 100644
@@ -1,46 +1,15 @@
-#!/usr/bin/env bash
-set -e
+#!/bin/bash
-cd "$(dirname "$BASH_SOURCE")/.."
-rm -rf vendor/
-source 'hack/.vendor-helpers.sh'
+# This file is just wrapper around vndr (github.com/LK4D4/vndr) tool.
+# For updating dependencies you should change `vendor.conf` file in root of the
+# project. Please refer to https://github.com/LK4D4/vndr/blob/master/README.md for
+# vndr usage.
-clone git github.com/urfave/cli v1.17.0
-clone git github.com/containers/image master
-clone git github.com/opencontainers/go-digest master
-clone git gopkg.in/cheggaaa/pb.v1 ad4efe000aa550bb54918c06ebbadc0ff17687b9 https://github.com/cheggaaa/pb
-clone git github.com/containers/storage master
-clone git github.com/Sirupsen/logrus v0.10.0
-clone git github.com/go-check/check v1
-clone git github.com/stretchr/testify v1.1.3
-clone git github.com/davecgh/go-spew master
-clone git github.com/pmezard/go-difflib master
-clone git github.com/pkg/errors master
-# docker deps from https://github.com/docker/docker/blob/v1.11.2/hack/vendor.sh
-clone git github.com/docker/docker v1.12.1
-clone git github.com/docker/engine-api 4eca04ae18f4f93f40196a17b9aa6e11262a7269
-clone git github.com/docker/go-connections 4ccf312bf1d35e5dbda654e57a9be4c3f3cd0366
-clone git github.com/vbatts/tar-split v0.9.11
-clone git github.com/gorilla/context 14f550f51a
-clone git github.com/gorilla/mux e444e69cbd
-clone git github.com/docker/go-units 651fc226e7441360384da338d0fd37f2440ffbe3
-clone git golang.org/x/net master https://github.com/golang/net.git
-# end docker deps
-clone git github.com/docker/distribution 07f32ac1831ed0fc71960b7da5d6bb83cb6881b5
-clone git github.com/docker/libtrust master
-clone git github.com/opencontainers/runc master
-clone git github.com/opencontainers/image-spec v1.0.0-rc3
-clone git github.com/mtrmac/gpgme master
-# openshift/origin' k8s dependencies as of OpenShift v1.1.5
-clone git github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed
-clone git k8s.io/kubernetes 4a3f9c5b19c7ff804cbc1bf37a15c044ca5d2353 https://github.com/openshift/kubernetes
-clone git github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee
-clone git gopkg.in/yaml.v2 d466437aa4adc35830964cffc5b5f262c63ddcb4
-clone git github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc
-# containers/storage's dependencies that aren't already being pulled in
-clone git github.com/mistifyio/go-zfs 22c9b32c84eb0d0c6f4043b6e90fc94073de92fa
-clone git github.com/pborman/uuid v1.0
+set -e
-clean
+if ! hash vndr; then
+ echo "Please install vndr with \"go get github.com/LK4D4/vndr\" and put it in your \$GOPATH"
+ exit 1
+fi
-mv vendor/src/* vendor/
+vndr "$@"
View
@@ -0,0 +1,35 @@
+github.com/urfave/cli v1.17.0
+github.com/containers/image master
+github.com/opencontainers/go-digest master
+gopkg.in/cheggaaa/pb.v1 ad4efe000aa550bb54918c06ebbadc0ff17687b9 https://github.com/cheggaaa/pb
+github.com/containers/storage master
+github.com/Sirupsen/logrus v0.10.0
+github.com/go-check/check v1
+github.com/stretchr/testify v1.1.3
+github.com/davecgh/go-spew master
+github.com/pmezard/go-difflib master
+github.com/pkg/errors master
+# docker deps from https://github.com/docker/docker/blob/v1.11.2/hack/vendor.sh
+github.com/docker/docker v1.12.1
+github.com/docker/engine-api 4eca04ae18f4f93f40196a17b9aa6e11262a7269
+github.com/docker/go-connections 4ccf312bf1d35e5dbda654e57a9be4c3f3cd0366
+github.com/vbatts/tar-split v0.9.11
+github.com/gorilla/context 14f550f51a
+github.com/gorilla/mux e444e69cbd
+github.com/docker/go-units 651fc226e7441360384da338d0fd37f2440ffbe3
+golang.org/x/net master https://github.com/golang/net.git
+# end docker deps
+github.com/docker/distribution 07f32ac1831ed0fc71960b7da5d6bb83cb6881b5
+github.com/docker/libtrust master
+github.com/opencontainers/runc master
+github.com/opencontainers/image-spec v1.0.0-rc3
+github.com/mtrmac/gpgme master
+# openshift/origin' k8s dependencies as of OpenShift v1.1.5
+github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed
+k8s.io/kubernetes 4a3f9c5b19c7ff804cbc1bf37a15c044ca5d2353 https://github.com/openshift/kubernetes
+github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee
+gopkg.in/yaml.v2 d466437aa4adc35830964cffc5b5f262c63ddcb4
+github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc
+# containers/storage's dependencies that aren't already being pulled in
+github.com/mistifyio/go-zfs 22c9b32c84eb0d0c6f4043b6e90fc94073de92fa
+github.com/pborman/uuid v1.0
@@ -1 +0,0 @@
-logrus
@@ -1,9 +0,0 @@
-language: go
-go:
- - 1.3
- - 1.4
- - 1.5
- - tip
-install:
- - go get -t ./...
-script: GOMAXPROCS=4 GORACE="halt_on_error=1" go test -race -v ./...
@@ -1,66 +0,0 @@
-# 0.10.0
-
-* feature: Add a test hook (#180)
-* feature: `ParseLevel` is now case-insensitive (#326)
-* feature: `FieldLogger` interface that generalizes `Logger` and `Entry` (#308)
-* performance: avoid re-allocations on `WithFields` (#335)
-
-# 0.9.0
-
-* logrus/text_formatter: don't emit empty msg
-* logrus/hooks/airbrake: move out of main repository
-* logrus/hooks/sentry: move out of main repository
-* logrus/hooks/papertrail: move out of main repository
-* logrus/hooks/bugsnag: move out of main repository
-* logrus/core: run tests with `-race`
-* logrus/core: detect TTY based on `stderr`
-* logrus/core: support `WithError` on logger
-* logrus/core: Solaris support
-
-# 0.8.7
-
-* logrus/core: fix possible race (#216)
-* logrus/doc: small typo fixes and doc improvements
-
-
-# 0.8.6
-
-* hooks/raven: allow passing an initialized client
-
-# 0.8.5
-
-* logrus/core: revert #208
-
-# 0.8.4
-
-* formatter/text: fix data race (#218)
-
-# 0.8.3
-
-* logrus/core: fix entry log level (#208)
-* logrus/core: improve performance of text formatter by 40%
-* logrus/core: expose `LevelHooks` type
-* logrus/core: add support for DragonflyBSD and NetBSD
-* formatter/text: print structs more verbosely
-
-# 0.8.2
-
-* logrus: fix more Fatal family functions
-
-# 0.8.1
-
-* logrus: fix not exiting on `Fatalf` and `Fatalln`
-
-# 0.8.0
-
-* logrus: defaults to stderr instead of stdout
-* hooks/sentry: add special field for `*http.Request`
-* formatter/text: ignore Windows for colors
-
-# 0.7.3
-
-* formatter/\*: allow configuration of timestamp layout
-
-# 0.7.2
-
-* formatter/text: Add configuration option for time format (#158)
Oops, something went wrong.

0 comments on commit 9b6b57d

Please sign in to comment.