Move docker module vendor files to root folder #4362
Conversation
|
The main file to check is vendor.json: https://github.com/elastic/beats/pull/4362/files#diff-bd290170e2912d3e8694db1a151066e5 |
exekias
force-pushed
the
docker-vendor-to-root
branch
from
deb8bee to
6ef9880
Compare
Other modules will use these
exekias
force-pushed
the
docker-vendor-to-root
branch
from
6ef9880 to
6e21c99
Compare
| @@ -10,6 +10,57 @@ Third party libraries used by the Beats project: | |||
|
|
|||
|
|
|||
| -------------------------------------------------------------------- | |||
| github.com/Microsoft/go-winio | |||
There was a problem hiding this comment.
I assume the change to the notice file is mainly to reordering. Perhaps we should find a way to sort the Notice entries in the future to not have duplicates and always the same sort order (alphabetical).
There was a problem hiding this comment.
Yes, this is caused by the way we generate NOTICE file
| }, | ||
| { | ||
| "checksumSHA1": "QndA9F9cJjk2u2SZ/T1xsHSfmrU=", | ||
| "origin": "github.com/ruflin/go-dockerclient", |
There was a problem hiding this comment.
I'm thinking to keep this one in this vendor directory as it is not used in all the other implementation. Also I hope to get rid of it in the long run ...
| @@ -0,0 +1,13 @@ | |||
| name: sarama | |||
There was a problem hiding this comment.
why was shopify dependency touched?
| @@ -0,0 +1,20 @@ | |||
| Interface,interface{},"something",nil,Inter | |||
There was a problem hiding this comment.
I'm not sure, I just did govendor sync, so I think they were outdated or manually changed?
There was a problem hiding this comment.
You are right, that is quite strange, because they are not updated in the vendor.json file?!? Glad you cleaned that up.
| "revision": "929412ddf58668dc5aa49e47fa822507f048d34b", | ||
| "revisionTime": "2017-04-20T15:30:38Z" | ||
| }, | ||
| { |
There was a problem hiding this comment.
Interesting that indentation was off in the file. Did you edit it manually before?
| { | ||
| "checksumSHA1": "QndA9F9cJjk2u2SZ/T1xsHSfmrU=", | ||
| "origin": "github.com/ruflin/go-dockerclient", | ||
| "path": "github.com/fsouza/go-dockerclient", |
There was a problem hiding this comment.
I would leave the local as I want to better get rid of this instead of making it available global ;-)
There was a problem hiding this comment.
Will move go-dockerclient back to docker module
There was a problem hiding this comment.
I tried and failed, govendor would force me to put all its dependencies back in or manually remove them + edit vendor.json
so I'm more in favor of keeping it under root, WDYT?
There was a problem hiding this comment.
You should be able to remove it if you add the docker client to the ignore list in docker. I prefer to not have it in the global dir.
| "path": "golang.org/x/net/context/ctxhttp", | ||
| "revision": "e90d6d0afc4c315a0d87a568ae68577cc15149a0", | ||
| "revisionTime": "2016-07-15T16:59:30Z" | ||
| "revision": "ffcf1bedda3b04ebb15a168a59800a73d6dc0f4d", |
There was a problem hiding this comment.
As this was already used, one option to make the PR smaller would be to keep it to the same version. But seeing the version is quite old, probably a good time to update.
There was a problem hiding this comment.
Yeah, I guess it's better to update having that go-dockerclient makes use of it
|
@exekias I update the vendor directory with few PR's:
You probably have to rebase this PR. If you like I can look into the moving of the docker files. |
|
Closing in favor of #4352, as dependencies are too interlaced, I removed duplicated vendors there, after adding the new client |
Move docker vendored files to the project root, we are using them in other places, like #4352