Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use gvisor-tap-vsock binaries directly #187

Merged
merged 16 commits into from
Mar 18, 2023
Merged

Conversation

sakai135
Copy link
Owner

@sakai135 sakai135 commented Feb 17, 2023

The main changes made to gvisor-tap-vsock for use in wsl-vpnkit was upstreamed back to gvisor-tap-vsock. This allows wsl-vpnkit to use the binaries from gvisor-tap-vsock directly.

@sakai135 sakai135 self-assigned this Feb 17, 2023
distro/ubuntu.dockerfile Outdated Show resolved Hide resolved
wsl-vpnkit Outdated Show resolved Hide resolved
@sakai135 sakai135 linked an issue Feb 17, 2023 that may be closed by this pull request
@scratchmex
Copy link

Is there anything I can help to getting this merged and released? I'm having the same problems as the linked issue.

@pvoliveira

This comment was marked as off-topic.

@sakai135
Copy link
Owner Author

sakai135 commented Mar 9, 2023

@scratchmex I'm actually waiting for gvisor-tap-vsock to cut a new release so I can just pull the binaries instead of compiling it here.

If you'd like to try this branch, you can build the branch or download wsl-vpnkit.tar.gz from the build artifacts and follow the updated readme doc. I would appreciate any feedback.

@gbraad
Copy link
Collaborator

gbraad commented Mar 10, 2023

I'm actually waiting for gvisor-tap-vsock to cut a new release

Sorry about this. I think this needs to be sped up. @cfergeau was looking into containers/gvisor-tap-vsock#161, to make that part of a new release. I think we should make an intermediate first.

@gbraad
Copy link
Collaborator

gbraad commented Mar 10, 2023

@sakai135 https://github.com/containers/gvisor-tap-vsock/releases/tag/v0.6.0 is available now; Thanks @cfergeau ;-)

@sakai135 sakai135 force-pushed the use-gvisor-tap-vsock-directly branch from f26b857 to 13920ab Compare March 14, 2023 07:28
@sakai135 sakai135 force-pushed the use-gvisor-tap-vsock-directly branch from 13920ab to 1c39aa8 Compare March 14, 2023 08:02
@sakai135
Copy link
Owner Author

There's an issue with v0.6.0 regarding a conflict with the stdio code upstreamed and a later PR. Submitted containers/gvisor-tap-vsock#195 to fix the issue.

Updated this PR branch to build gvisor-tap-vsock from the fix branch for now.

@cfergeau
Copy link

I've cut a 0.6.1 gvisor-tap-vsock release with your fix

@sakai135 sakai135 force-pushed the use-gvisor-tap-vsock-directly branch from 860c8e9 to b54b3ac Compare March 14, 2023 22:15
@sakai135 sakai135 marked this pull request as ready for review March 14, 2023 22:33
@sakai135 sakai135 changed the title WIP use gvisor-tap-vsock binaries directly use gvisor-tap-vsock binaries directly Mar 14, 2023
@sakai135 sakai135 merged commit 5084c6d into main Mar 18, 2023
@sakai135 sakai135 deleted the use-gvisor-tap-vsock-directly branch March 18, 2023 04:50
@adpeyre

This comment was marked as off-topic.

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.

Standalone mode doesn't work ?
6 participants