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

windows: Use prebuilt gvproxy/win-sshproxy binaries #20202

Merged
merged 1 commit into from
Oct 3, 2023

Conversation

cfergeau
Copy link
Contributor

Since gvisor-tap-vsock 0.7.1, the upstream project ships pre-built
Windows binaries for gvproxy and win-sshproxy. These binaries are built
with -Hwindowsgui as needed by podman.

This makes the same change in winmake.ps1, but I had to hardcode
gvisor-tap-vsock version in one more place.

Does this PR introduce a user-facing change?

None

@rhatdan
Copy link
Member

rhatdan commented Sep 29, 2023

@n1hility @ashley-cui @baude PTAL

@baude
Copy link
Member

baude commented Sep 29, 2023

LGTM

Copy link
Member

@n1hility n1hility left a comment

Choose a reason for hiding this comment

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

Looks good other than the minor issue

winmake.ps1 Outdated Show resolved Hide resolved
Copy link
Member

@ashley-cui ashley-cui left a comment

Choose a reason for hiding this comment

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

Do we want to keep both targets in the .ps1 just in case a user wants to build gvproxy off main, or do you think that won't be a use case?

@cfergeau
Copy link
Contributor Author

cfergeau commented Oct 2, 2023

Do we want to keep both targets in the .ps1 just in case a user wants to build gvproxy off main, or do you think that won't be a use case?

I don't think this will be needed very often/at all so I would not keep it. Easy to revert/rework if this turns out to be needed. Rebuilding one of these binaries from git can be done with a one-liner: GOOS=windows go install -ldflags -H=windowsgui github.com/containers/gvisor-tap-vsock/cmd/[email protected]

Since gvisor-tap-vsock 0.7.1, the upstream project ships pre-built
Windows binaries for gvproxy and win-sshproxy. These binaries are built
with -Hwindowsgui as needed by podman.

This makes the same change in winmake.ps1, but I had to hardcode
gvisor-tap-vsock version in one more place.

[NO NEW TESTS NEEDED]

Signed-off-by: Christophe Fergeau <[email protected]>
@ashley-cui
Copy link
Member

LGTM

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 3, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cfergeau, n1hility

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 3, 2023
@n1hility
Copy link
Member

n1hility commented Oct 3, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 3, 2023
@openshift-ci openshift-ci bot merged commit fdf3e4b into containers:main Oct 3, 2023
97 checks passed
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Jan 2, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants