remote: fix connhelpers with custom dialer #2327
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
With the new dial-stdio command the dialer is split from `Client` function in order to access it directly. This breaks the custom connhelpers functionality as support for connhelpers is a feature of the default dialer. If client defines a custom dialer then only it is used without extra modifications. This means that remote driver dialer needs to detect the connhelpers on its own. Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
I think a custom test is fine, I will open a PR with this test to make it fail with current master. |
tonistiigi
commented
Mar 9, 2024
crazy-max
force-pushed
the
remote-connhelper-fix
branch
2 times, most recently
from
52c454d
to
73e04c9
Compare
crazy-max
approved these changes
Mar 9, 2024
tonistiigi
commented
Mar 9, 2024
crazy-max
force-pushed
the
remote-connhelper-fix
branch
4 times, most recently
from
2e85fbb
to
05b3229
Compare
cpuguy83
approved these changes
Mar 9, 2024
crazy-max
force-pushed
the
remote-connhelper-fix
branch
from
05b3229
to
d9ba74a
Compare
jsternberg
approved these changes
Mar 11, 2024
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
crazy-max
force-pushed
the
remote-connhelper-fix
branch
from
d9ba74a
to
b1490ed
Compare
jsternberg
approved these changes
Mar 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix #2324
closes #2329
With the new dial-stdio command the dialer is split from
Clientfunction in order to access it directly.This breaks the custom connhelpers functionality
as support for connhelpers is a feature of the default dialer. If client defines a custom dialer then only it is used without extra modifications. This means that remote driver dialer needs to detect the
connhelpers on its own.
The relevant default dialer addition is in https://github.com/moby/buildkit/blob/a38011b9f57db4b805e6bb0322d7d923b341bc6e/client/client.go#L109-L115 .
@cpuguy83 @jsternberg
@crazy-max For test, should we have one custom test just for connhelpers or maybe just add extra config in the matrix that runs remote driver with a
docker-container://endpoint address?