Skip to content
This repository has been archived by the owner on Feb 1, 2021. It is now read-only.

Updating vendoring for docker/docker to 5eca8382b03278dc42c228b3d14dec0909ce655b #2734

Merged

Conversation

nishanttotla
Copy link
Contributor

This was long due. This PR also vendors in additionally required dependencies, and updates types etc based on that.

Fix #2666.

…9ce655b

Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Adding github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a

Updating github.com/Microsoft/go-winio vendoring to v0.4.2

Updating vendoring for golang.org/x/sys 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9

Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
@nishanttotla nishanttotla self-assigned this Jun 19, 2017
@nishanttotla nishanttotla force-pushed the update-docker-vendoring branch 2 times, most recently from b3b63e9 to 9749be0 Compare June 19, 2017 20:18
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
@nishanttotla nishanttotla changed the title [WIP] Updating vendoring for docker/docker to 5eca8382b03278dc42c228b3d14dec0909ce655b Updating vendoring for docker/docker to 5eca8382b03278dc42c228b3d14dec0909ce655b Jun 19, 2017
@nishanttotla
Copy link
Contributor Author

Ping @docker/core-swarm-maintainers PTAL.

This is important to merge relatively soon, because it is blocking the release of 1.2.7.

bImageNotFoundError113, _ := regexp.MatchString(`repository \S* not found`, err.Error())
if (bImageNotFoundError || bImageNotFoundError113 || client.IsErrImageNotFound(err)) && !config.HaveNodeConstraint() {
bRepositoryNotFoundError1706, _ := regexp.MatchString(`repository does not exist`, err.Error())
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is probably the only place where a review would be useful. The error message changed again so I needed to add an extra case for that.

cc @aluzzardi @wsong

Copy link
Contributor

@wsong wsong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nishanttotla nishanttotla merged commit 9db379f into docker-archive:master Jun 20, 2017
@nishanttotla nishanttotla deleted the update-docker-vendoring branch June 20, 2017 18:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants