Skip to content

Commit af9875d

Browse files
andrewsykimmurali-reddy
authored andcommitted
Use dep for managing vendor/ (#395)
* vendor changes from dep init * add Gopkg.lock and Gopkg.toml * delete glide.lock and glide.yaml * build gobgp from vendor
1 parent 945a13c commit af9875d

File tree

10,733 files changed

+79347
-4074306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

10,733 files changed

+79347
-4074306
lines changed

Gopkg.lock

Lines changed: 938 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
# Gopkg.toml example
2+
#
3+
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
4+
# for detailed Gopkg.toml documentation.
5+
#
6+
# required = ["github.com/user/thing/cmd/thing"]
7+
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
8+
#
9+
# [[constraint]]
10+
# name = "github.com/user/project"
11+
# version = "1.0.0"
12+
#
13+
# [[constraint]]
14+
# name = "github.com/user/project2"
15+
# branch = "dev"
16+
# source = "github.com/myfork/project2"
17+
#
18+
# [[override]]
19+
# name = "github.com/x/y"
20+
# version = "2.4.0"
21+
#
22+
# [prune]
23+
# non-go = false
24+
# go-tests = true
25+
# unused-packages = true
26+
27+
28+
required = ["github.com/osrg/gobgp/gobgp"]
29+
30+
[[constraint]]
31+
name = "github.com/aws/aws-sdk-go"
32+
version = "1.8.36"
33+
34+
[[constraint]]
35+
name = "github.com/containernetworking/cni"
36+
version = "0.5.2"
37+
38+
[[constraint]]
39+
name = "github.com/coreos/go-iptables"
40+
version = "0.2.0"
41+
42+
[[constraint]]
43+
branch = "master"
44+
name = "github.com/docker/docker"
45+
46+
[[constraint]]
47+
branch = "master"
48+
name = "github.com/golang/glog"
49+
50+
[[constraint]]
51+
name = "github.com/onsi/ginkgo"
52+
version = "1.4.0"
53+
54+
[[constraint]]
55+
name = "github.com/onsi/gomega"
56+
version = "1.3.0"
57+
58+
[[constraint]]
59+
name = "github.com/osrg/gobgp"
60+
version = "1.22.0"
61+
62+
[[constraint]]
63+
name = "github.com/prometheus/client_golang"
64+
version = "0.8.0"
65+
66+
[[constraint]]
67+
branch = "master"
68+
name = "github.com/spf13/pflag"
69+
70+
[[constraint]]
71+
name = "github.com/vishvananda/netlink"
72+
version = "1.0.0"
73+
74+
[[constraint]]
75+
branch = "master"
76+
name = "github.com/vishvananda/netns"
77+
78+
[[constraint]]
79+
branch = "release-1.8"
80+
name = "k8s.io/api"
81+
82+
[[constraint]]
83+
name = "k8s.io/apimachinery"
84+
version = "kubernetes-1.8.0-rc.1"
85+
86+
[[constraint]]
87+
branch = "release-5.0"
88+
name = "k8s.io/client-go"
89+
90+
[[constraint]]
91+
name = "github.com/docker/libnetwork"
92+
revision = "14aa49f99093e1a22e65155b641103762911db8d"
93+
94+
[[override]]
95+
revision = "1e2f10eb65743fed02f573d31a4587de09afb20e"
96+
name = "github.com/docker/distribution"
97+
98+
[prune]
99+
go-tests = true
100+
unused-packages = true

Makefile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,9 @@ else
188188
@echo
189189
endif
190190

191-
gobgp: vendor/github.com/osrg/gobgp/gobgp
192-
$(DOCKER) run -v $(PWD):/pwd $(DOCKER_BUILD_IMAGE) \
193-
sh -c ' \
194-
apk add -U git && \
195-
ln -s /pwd/vendor /go/src && \
196-
CGO_ENABLED=0 GOARCH=$(GOARCH) go get github.com/osrg/gobgp/gobgp && \
197-
cp `find /go/bin -type f -name gobgp` /pwd'
191+
gobgp:
192+
cd vendor/github.com/osrg/gobgp/gobgp && \
193+
CGO_ENABLED=0 GOARCH=$(GOARCH) GOOS=linux go build -o $(MAKEFILE_DIR)/gobgp
198194

199195
multiarch-check:
200196
@[ -z "$(QEMU_ARCH)" ] && exit 0; \

0 commit comments

Comments
 (0)