Skip to content

vendor: update docker dependency#1245

Closed
SamWhited wants to merge 1 commit intomoby:masterfrom
SamWhited:update_dockerd
Closed

vendor: update docker dependency#1245
SamWhited wants to merge 1 commit intomoby:masterfrom
SamWhited:update_dockerd

Conversation

@SamWhited
Copy link
Copy Markdown
Contributor

@SamWhited SamWhited commented Nov 6, 2019

This pulls in
moby/moby@b96a0c7
which is needed by #1164.
It is submitted as a separate PR to keep the diff on #1164 small.

To validate run make vendor

@GordonTheTurtle
Copy link
Copy Markdown
Collaborator

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "update_dockerd" git@github.com:SamWhited/buildkit.git somewhere
$ cd somewhere
$ git commit --amend -s --no-edit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

@SamWhited
Copy link
Copy Markdown
Contributor Author

Tests now passing, I had to add Microsoft/hcsshim (unsure why this wasn't pulled in by Go) and x/sys as well to make cross compiling work correctly on Windows.

This pulls in moby/moby@b96a0c7 which is needed by #1164.
It is submitted as a separate PR to keep the diff on #1164 small.

Signed-off-by: Sam Whited <sam@samwhited.com>
@SamWhited
Copy link
Copy Markdown
Contributor Author

make vendor appears to be trimming any code that's not being imported, so I'm merging this back into the other PR (#1164) and it will be a bit harder for whomever reviews that, sorry.

@SamWhited SamWhited closed this Nov 7, 2019
@SamWhited SamWhited deleted the update_dockerd branch November 7, 2019 02:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants