Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docker module to govendor and most recent version #3874

Merged
merged 1 commit into from Apr 4, 2017

Conversation

Projects
None yet
3 participants
@ruflin
Copy link
Collaborator

commented Mar 31, 2017

Our docker version depends now on our own fork to not break cross compiling. The fork can be found here: https://github.com/ruflin/docker/tree/17.03.1-beats-branch And here is the commit with the changes: ruflin/docker@f02993b

The changes are quite minimal which should make it rather easy to keep it up-to-date. Also this removes a list of dependency we don't need.

In the long term this should be replaced through our own client not depending on docker and the external client library.

The commands used to create this were:

govendor fetch +out
govendor fetch github.com/docker/docker/pkg/idtools::github.com/ruflin/docker/pkg/idtools@17.03.1-beats-branch +out
govendor fetch github.com/docker/docker/pkg/jsonmessage::github.com/ruflin/docker/pkg/jsonmessage@17.03.1-beats-branch +out

My intention was to make all the paths dependent on the fork with the command:

govendor fetch github.com/docker/docker::github.com/ruflin/docker/...@17.03.1-beats-branch +out

But this didn't work as expected.

@ruflin ruflin force-pushed the ruflin:docker-govendor branch from 20ae0bb to f0eb672 Mar 31, 2017

@ruflin ruflin added in progress and removed review labels Mar 31, 2017

@ruflin ruflin force-pushed the ruflin:docker-govendor branch 2 times, most recently from 20c998e to d33a7b2 Mar 31, 2017

@ruflin ruflin added review and removed in progress labels Mar 31, 2017

@ruflin ruflin force-pushed the ruflin:docker-govendor branch from d33a7b2 to 76a330d Mar 31, 2017

"version": "17.03.1-beats-branch",
"versionExact": "v1.13.1"
},
{

This comment has been minimized.

Copy link
@vjsamuel

vjsamuel Apr 1, 2017

Contributor

why are there two github.com/ruflin/docker in this vendor.json? The first one seemed right, where we are trying to use a fork of docker. This one doesnt seem to be right

@ruflin ruflin force-pushed the ruflin:docker-govendor branch from 76a330d to ef5ca5f Apr 3, 2017

@ruflin

This comment has been minimized.

Copy link
Collaborator Author

commented Apr 3, 2017

@vjsamuel I played around with this some more. Unfortunately the only working option I found is that I update the two package paths I want to update by defining them specifically. This is not very nice as not all parts are not dependent on the fork :-(

Update docker dependencies to most recent version
Our docker version depends now on our own fork to not break cross compiling. The fork can be found here: https://github.com/ruflin/docker/tree/17.03.1-beats-branch And here is the commit with the changes: ruflin/docker@f02993b

The changes are quite minimal which should make it rather easy to keep it up-to-date. Also this removes a list of dependency we don't need.

In the long term this should be replaced through our own client not depending on docker and the external client library.

The commands used to create this were:

```
govendor fetch +out
govendor fetch github.com/docker/docker/pkg/idtools::github.com/ruflin/docker/pkg/idtools@17.03.1-beats-branch +out
govendor fetch github.com/docker/docker/pkg/jsonmessage::github.com/ruflin/docker/pkg/jsonmessage@17.03.1-beats-branch +out
```

My intention was to make all the paths dependent on the fork with the command:

```
govendor fetch github.com/docker/docker::github.com/ruflin/docker/...@17.03.1-beats-branch +out
```

But this didn't work as expected.

@ruflin ruflin force-pushed the ruflin:docker-govendor branch from ef5ca5f to 4a3e612 Apr 3, 2017

@andrewkroh andrewkroh merged commit ca4cda8 into elastic:master Apr 4, 2017

4 checks passed

codecov/patch Coverage not affected when comparing 76f5873...4a3e612
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
default Build finished.
Details

athom added a commit to athom/beats that referenced this pull request Jan 25, 2018

Update docker dependencies to most recent version (elastic#3874)
Our docker version depends now on our own fork to not break cross compiling. The fork can be found here: https://github.com/ruflin/docker/tree/17.03.1-beats-branch And here is the commit with the changes: ruflin/docker@f02993b

The changes are quite minimal which should make it rather easy to keep it up-to-date. Also this removes a list of dependency we don't need.

In the long term this should be replaced through our own client not depending on docker and the external client library.

The commands used to create this were:

```
govendor fetch +out
govendor fetch github.com/docker/docker/pkg/idtools::github.com/ruflin/docker/pkg/idtools@17.03.1-beats-branch +out
govendor fetch github.com/docker/docker/pkg/jsonmessage::github.com/ruflin/docker/pkg/jsonmessage@17.03.1-beats-branch +out
```

My intention was to make all the paths dependent on the fork with the command:

```
govendor fetch github.com/docker/docker::github.com/ruflin/docker/...@17.03.1-beats-branch +out
```

But this didn't work as expected.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.