Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[17.03] Patch go connections#28

Merged
seemethere merged 3 commits intodocker-archive:17.03.xfrom
cyli:patch-go-connections
Aug 3, 2018
Merged

[17.03] Patch go connections#28
seemethere merged 3 commits intodocker-archive:17.03.xfrom
cyli:patch-go-connections

Conversation

@cyli
Copy link
Copy Markdown

@cyli cyli commented Jul 30, 2018 •
edited
Loading

This is a cherry pick of the following 2 PRs:

Cherry picks were not clean, but was a pretty easy resolution.

Unfortunately the test can't be merged - the test depends on features in go 1.8.x (GetClientCertificate), and 17.03 was on go 1.7.5.

Either I will have to try to figure out how to write a new test, or we leave it out.

cyli added 2 commits July 30, 2018 11:16
@cyli
Bump the version of go-connections
f914585 
Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit 3c05ff4)
@cyli
Use either the system root pool or an empty cert pool with custom CA …
10dce8c 
…roots,

and not a joint system+custom CA roots pool, when connecting from a docker
client to a remote daemon

Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit 60d1720)
@andrewhsu andrewhsu changed the title Patch go connections [17.03] Patch go connections Jul 30, 2018
@andrewhsu andrewhsu requested a review from dmcgowan July 30, 2018 18:33
@seemethere
Copy link
Copy Markdown

seemethere commented Jul 30, 2018

We'll be ignoring multi-arch failures since the Debian Jessie repositories for extended architectures has been deprecated.

@dmcgowan
Copy link
Copy Markdown

dmcgowan commented Jul 30, 2018

LGTM

seemethere
seemethere approved these changes Aug 1, 2018
View reviewed changes
Copy link
Copy Markdown

@seemethere seemethere left a comment

Choose a reason for hiding this comment

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

LGTM

@seemethere
Copy link
Copy Markdown

seemethere commented Aug 1, 2018

CI failures are related to this branch being super old, manually verified that this branch can build.

@seemethere seemethere merged commit 520f88a into docker-archive:17.03.x Aug 3, 2018
@cyli cyli deleted the patch-go-connections branch August 3, 2018 18:49
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@dmcgowan dmcgowan Awaiting requested review from dmcgowan

1 more reviewer

@seemethere seemethere seemethere approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@cyli @seemethere @dmcgowan