Skip to content
This repository was archived by the owner on Jun 20, 2024. It is now read-only.

Docker 1.12: handle daemon named 'dockerd'#2380

Closed
bboreham wants to merge 2 commits intomasterfrom
issues/2379
Closed

Docker 1.12: handle daemon named 'dockerd'#2380
bboreham wants to merge 2 commits intomasterfrom
issues/2379

Conversation

@bboreham
Copy link
Contributor

Fixes #2379

@bboreham bboreham added this to the 1.6.0 milestone Jun 16, 2016
@rade
Copy link
Member

rade commented Jun 16, 2016

This should be on the 1.5 branch.

@awh awh self-assigned this Jun 17, 2016
@awh
Copy link
Contributor

awh commented Jun 17, 2016

LGTM. Quick aside - this

https://github.com/weaveworks/weave/pull/2380/files#diff-5fb26b2385c2ea3455765e854c85c607R50

break statement is redundant isn't it?

Did you want to retarget this at the 1.5 branch?

@awh awh assigned bboreham and unassigned awh Jun 17, 2016
@bboreham
Copy link
Contributor Author

I imagine that break statement was meant to end the loop, but it doesn't.

However, if we did make it break the loop, I suspect we could mistake a docker run -d command for the daemon process.

bboreham added 2 commits June 17, 2016 13:05
This means when Docker says "101 UPGRADED" the proxy will say the
same, instead of "200 OK".  Docker 1.12 barfs if you do that.
@bboreham
Copy link
Contributor Author

Replaced by #2382 on 1.5 branch

@bboreham bboreham closed this Jun 17, 2016
@bboreham bboreham modified the milestones: n/a, 1.6.0 Jun 17, 2016
@bboreham
Copy link
Contributor Author

Changed my mind: the break is just superfluous

@bboreham bboreham deleted the issues/2379 branch November 9, 2016 17:23
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants