Skip to content

Commit 85d98d2

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request operator-framework#26 from jpeeler/remove-dep
Remove dep
2 parents d5f1ca4 + 260ce49 commit 85d98d2

Some content is hidden

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

87 files changed

+3480
-1102
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ RUN make static
1818
# copy and build vendored grpc_health_probe
1919
RUN mkdir -p /go/src/github.com/grpc-ecosystem && \
2020
cp -R vendor/github.com/grpc-ecosystem/grpc-health-probe /go/src/github.com/grpc-ecosystem/grpc_health_probe && \
21+
cp -R vendor/ /go/src/github.com/grpc-ecosystem/grpc_health_probe && \
2122
cd /go/src/github.com/grpc-ecosystem/grpc_health_probe && \
22-
go get -u github.com/golang/dep/cmd/dep && \
23-
dep ensure -vendor-only -v && \
2423
CGO_ENABLED=0 go install -a -tags netgo -ldflags "-w"
2524

2625
FROM openshift/origin-base

‎configmap-registry.Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@ RUN make static
1212
FROM golang:1.10-alpine as probe-builder
1313

1414
RUN apk update && apk add build-base git
15-
RUN go get -u github.com/golang/dep/cmd/dep
1615
ENV ORG github.com/grpc-ecosystem
1716
ENV PROJECT $ORG/grpc_health_probe
1817
WORKDIR /go/src/$PROJECT
1918

2019
COPY --from=builder /go/src/github.com/operator-framework/operator-registry/vendor/$ORG/grpc-health-probe .
21-
RUN dep ensure -vendor-only -v && \
22-
CGO_ENABLED=0 go install -a -tags netgo -ldflags "-w"
20+
COPY --from=builder /go/src/github.com/operator-framework/operator-registry/vendor .
21+
RUN CGO_ENABLED=0 go install -a -tags netgo -ldflags "-w"
2322

2423

2524
FROM scratch

‎go.mod‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@ require (
1212
github.com/emicklei/go-restful-swagger12 v0.0.0-20170926063155-7524189396c6 // indirect
1313
github.com/ghodss/yaml v1.0.0
1414
github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff // indirect
15+
github.com/golang/lint v0.0.0-20180702182130-06c8688daad7 // indirect
1516
github.com/golang/protobuf v1.2.0
1617
github.com/gorilla/websocket v1.4.0 // indirect
18+
github.com/gregjones/httpcache v0.0.0-20190203031600-7a902570cb17 // indirect
1719
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
18-
github.com/grpc-ecosystem/grpc-health-probe v0.2.0
20+
github.com/grpc-ecosystem/grpc-health-probe v0.2.1-0.20181220223928-2bf0a5b182db
1921
github.com/hashicorp/golang-lru v0.5.0 // indirect
2022
github.com/imdario/mergo v0.3.7 // indirect
2123
github.com/jonboulle/clockwork v0.1.0 // indirect
@@ -31,7 +33,7 @@ require (
3133
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a
3234
golang.org/x/oauth2 v0.0.0-20181105165119-ca4130e427c7 // indirect
3335
golang.org/x/tools v0.0.0-20181207222222-4c874b978acb // indirect
34-
google.golang.org/grpc v1.16.0
36+
google.golang.org/grpc v1.17.0
3537
k8s.io/api v0.0.0-20190118113203-912cbe2bfef3
3638
k8s.io/apiextensions-apiserver v0.0.0-20181204003618-e419c5771cdc
3739
k8s.io/apimachinery v0.0.0-20190118094746-1525e4dadd2d

‎go.sum‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,16 @@ github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoA
8888
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
8989
github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f h1:ShTPMJQes6tubcjzGMODIVG5hlrCeImaBnZzKF2N8SM=
9090
github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
91+
github.com/gregjones/httpcache v0.0.0-20190203031600-7a902570cb17 h1:prg2TTpTOcJF1jRWL2zSU1FQNgB0STAFNux8GK82y8k=
92+
github.com/gregjones/httpcache v0.0.0-20190203031600-7a902570cb17/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
9193
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
9294
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
9395
github.com/grpc-ecosystem/grpc-gateway v1.5.1/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
9496
github.com/grpc-ecosystem/grpc-gateway v1.6.3/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
9597
github.com/grpc-ecosystem/grpc-health-probe v0.2.0 h1:Os9pdioxm25j+92QbQNW7sOClH9Px9Jo9W9nhLTA5EU=
9698
github.com/grpc-ecosystem/grpc-health-probe v0.2.0/go.mod h1:4GVx/bTCtZaSzhjbGueDY5YgBdsmKeVx+LErv/n0L6s=
99+
github.com/grpc-ecosystem/grpc-health-probe v0.2.1-0.20181220223928-2bf0a5b182db h1:UxmGBzaBcWDQuQh9E1iT1dWKQFbizZ+SpTd1EL4MSqs=
100+
github.com/grpc-ecosystem/grpc-health-probe v0.2.1-0.20181220223928-2bf0a5b182db/go.mod h1:uBKkC2RbarFsvS5jMJHpVhTLvGlGQj9JJwkaePE3FWI=
97101
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
98102
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
99103
github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
@@ -175,6 +179,7 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
175179
golang.org/x/crypto v0.0.0-20181015023909-0c41d7ab0a0e h1:IzypfodbhbnViNUO/MEh0FzCUooG97cIGfdggUrUSyU=
176180
golang.org/x/crypto v0.0.0-20181015023909-0c41d7ab0a0e/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
177181
golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
182+
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
178183
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
179184
golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
180185
golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -205,6 +210,8 @@ google.golang.org/genproto v0.0.0-20181016170114-94acd270e44e h1:I5s8aUkxqPjgAss
205210
google.golang.org/genproto v0.0.0-20181016170114-94acd270e44e/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
206211
google.golang.org/grpc v1.16.0 h1:dz5IJGuC2BB7qXR5AyHNwAUBhZscK2xVez7mznh72sY=
207212
google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
213+
google.golang.org/grpc v1.17.0 h1:TRJYBgMclJvGYn2rIMjj+h9KtMt5r1Ij7ODVRIZkwhk=
214+
google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
208215
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
209216
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
210217
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=

‎upstream.Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@ RUN ./bin/initializer -o ./bundles.db
1616
FROM golang:1.10-alpine as probe-builder
1717

1818
RUN apk update && apk add build-base git
19-
RUN go get -u github.com/golang/dep/cmd/dep
2019
ENV ORG github.com/grpc-ecosystem
2120
ENV PROJECT $ORG/grpc_health_probe
2221
WORKDIR /go/src/$PROJECT
2322

2423
COPY --from=builder /build/vendor/$ORG/grpc-health-probe .
25-
RUN dep ensure -vendor-only -v && \
26-
CGO_ENABLED=0 go install -a -tags netgo -ldflags "-w"
24+
COPY --from=builder /build/vendor .
25+
RUN CGO_ENABLED=0 go install -a -tags netgo -ldflags "-w"
2726

2827
FROM scratch
2928
COPY --from=builder /build/bundles.db /bundles.db

‎vendor/github.com/gregjones/httpcache/.travis.yml‎

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

‎vendor/github.com/gregjones/httpcache/httpcache.go‎

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

‎vendor/github.com/grpc-ecosystem/grpc-health-probe/.gitignore‎

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

‎vendor/github.com/grpc-ecosystem/grpc-health-probe/.travis.yml‎

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/grpc-ecosystem/grpc-health-probe/Dockerfile‎

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

0 commit comments

Comments
 (0)