Skip to content

Commit

Permalink
Vendoring: Switch to fixes revision versioning
Browse files Browse the repository at this point in the history
virtcontainers has already switched to vendoring specific revisions of dependencies.
Switch the runtime to also adopt the same.

This allows an user to do perform

rm -rf vendor
dep ensure

without having to worry about unwanted changes being picked up.

The downside is that the revendoring becomes manual. It also requires that runtime dependency
revisions match that the exact revision used by virtcontainers (which may be a good thing).

Fixes clearcontainers#779

Signed-off-by: Manohar Castelino <[email protected]>
  • Loading branch information
mcastelino committed Oct 31, 2017
1 parent e1cc3cb commit 57f7f85
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 30 deletions.
7 changes: 1 addition & 6 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 18 additions & 24 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,87 +64,81 @@
## what source location any dependent projects specify.
# source = "https://github.com/myfork/package.git"



[[constraint]]
branch = "master"
name = "github.com/01org/ciao"
revision = "b2a8a2ecea1318ae28a0861191ec385532491b5a"

[[constraint]]
branch = "master"
name = "github.com/Azure/go-ansiterm"

[[constraint]]
branch = "master"
name = "github.com/BurntSushi/toml"
revision = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"

[[constraint]]
branch = "master"
name = "github.com/clearcontainers/proxy"
revision = "1d2a6a3ea132a86abd0731408b7dc34f2fc17d55"

[[constraint]]
branch = "master"
name = "github.com/containernetworking/cni"
revision = "ff7c3e02e3c212f63a642ad64a5ed22ee54450bd"

[[constraint]]
branch = "master"
name = "github.com/containernetworking/plugins"
revision = "e256564546e8d1ca8a36911f8445c11929043221"

[[constraint]]
name = "github.com/containers/virtcontainers"
revision = "c3c42b5690ce384a26dcb8ac59e922a20dd0ac7a"

[[constraint]]
branch = "master"
name = "github.com/davecgh/go-spew"
revision = "346938d642f2ec3594ed81d874461961cd0faa76"

[[constraint]]
branch = "master"
name = "github.com/dlespiau/covertool"
revision = "b82616d290e628437bc08b858b5ecb3d7fe9ea53"

[[constraint]]
branch = "master"
name = "github.com/docker/docker"
name = "github.com/go-ini/ini"
revision = "20b96f641a5ea98f2f8619ff4f3e061cff4833bd"

[[constraint]]
branch = "master"
name = "github.com/kubernetes-incubator/cri-o"
revision = "3394b3b2d6af0e41d185bb695c6378be5dd4d61d"

[[constraint]]
branch = "master"
name = "github.com/mitchellh/mapstructure"
revision = "d0303fe809921458f417bcf828397a65db30a7e4"

[[constraint]]
branch = "master"
name = "github.com/opencontainers/runc"
revision = "a0159fddcd197a57790b6dd5654802b7dc8f80be"

[[constraint]]
name = "github.com/opencontainers/runtime-spec"
revision = "a8125598b32a65ff55c83214d3c262383178e7fa"

[[constraint]]
name = "github.com/pmezard/go-difflib"
version = "1.0.0"
revision = "792786c7400a136282c1664665ae0a8db921c6c2"

[[constraint]]
branch = "master"
name = "github.com/sirupsen/logrus"
revision = "89742aefa4b206dcf400792f3bd35b542998eb3b"

[[constraint]]
branch = "master"
name = "github.com/stretchr/testify"
revision = "890a5c3458b43e6104ff5da8dfa139d013d77544"

[[constraint]]
branch = "master"
name = "github.com/urfave/cli"
revision = "9e5b04886c4bfee2ceba1465b8121057355c4e53"

[[constraint]]
branch = "master"
name = "github.com/vishvananda/netlink"
revision = "b7fbf1f5291ecf8ae5179d3202e914cb98cfe400"

[[constraint]]
branch = "master"
name = "github.com/vishvananda/netns"
revision = "86bef332bfc3b59b7624a600bd53009ce91a9829"

[[constraint]]
name = "golang.org/x/crypto"
Expand Down

0 comments on commit 57f7f85

Please sign in to comment.