opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-17 23:26:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25501 from evidolob/update-gvisor

Browse Source 
update gvproxy version to 0.8.4
This commit is contained in:
openshift-merge-bot[bot]
2025-03-11 13:53:55 +00:00
committed by GitHub
parent 47003f76db 48662fa32b
commit 264c8da0b9
7 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -219,7 +219,7 @@ endif
# gvisor-tap-vsock version for gvproxy.exe and win-sshproxy.exe downloads
# the upstream project ships pre-built binaries since version 0.7.1
GV_VERSION=v0.8.1
GV_VERSION=v0.8.4
###
### Primary entry-point targets

2
contrib/pkginstaller/Makefile
View File

@ -6,7 +6,7 @@ ifeq ($(ARCH), aarch64)
else
GOARCH:=$(ARCH)
endif
GVPROXY_VERSION ?= 0.8.3
GVPROXY_VERSION ?= 0.8.4
VFKIT_VERSION ?= 0.6.0
KRUNKIT_VERSION ?= 0.1.4
GVPROXY_RELEASE_URL ?= https://github.com/containers/gvisor-tap-vsock/releases/download/v$(GVPROXY_VERSION)/gvproxy-darwin

2
go.mod
View File

@ -16,7 +16,7 @@ require (
github.com/containers/buildah v1.39.2
github.com/containers/common v0.62.1
github.com/containers/conmon v2.0.20+incompatible
github.com/containers/gvisor-tap-vsock v0.8.3
github.com/containers/gvisor-tap-vsock v0.8.4
github.com/containers/image/v5 v5.34.1
github.com/containers/libhvee v0.10.0
github.com/containers/ocicrypt v1.2.1

4
go.sum
View File

@ -82,8 +82,8 @@ github.com/containers/common v0.62.1 h1:durvu7Kelb8PYgX7bwuAg/d5LKj2hs3cAaqcU7Vn
github.com/containers/common v0.62.1/go.mod h1:n9cEboBmY3AnTk1alkq4t7sLM4plwkDCiaWbsf67YxE=
github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg=
github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
github.com/containers/gvisor-tap-vsock v0.8.3 h1:Am3VdjXTn8Mn+dNhgkiRcCFOTSM8u9aWKLW3KTHOGjk=
github.com/containers/gvisor-tap-vsock v0.8.3/go.mod h1:46MvrqNuRNbjV4ZsZ3mHVJjR2Eh+fpyRh72EvWWFFjU=
github.com/containers/gvisor-tap-vsock v0.8.4 h1:z7MqcldnXYGaU6uTaKVl7RFxTmbhNsd2UL0CyM3fdBs=
github.com/containers/gvisor-tap-vsock v0.8.4/go.mod h1:Guh8d/SiuJ9jlnuIyUjcKkFKQ2qpLhNKPGD1jMoIt2Q=
github.com/containers/image/v5 v5.34.1 h1:/m2bkFnuedTyNkzma8s7cFLjeefPIb4trjyafWhIlwM=
github.com/containers/image/v5 v5.34.1/go.mod h1:/WnvUSEfdqC/ahMRd4YJDBLrpYWkGl018rB77iB3FDo=
github.com/containers/libhvee v0.10.0 h1:7VLv8keWZpHuGmWvyY4c1mVH5V1JYb1G78VC+8AlrM0=

25
vendor/github.com/containers/gvisor-tap-vsock/pkg/types/gvproxy_command.go generated vendored
View File

@ -19,6 +19,9 @@ type GvproxyCommand struct {
// List of endpoints the user wants to listen to
endpoints []string
// List of service endpoints the user wants to listen to
servicesEndpoints []string
// Map of different sockets provided by user (socket-type flag:socket)
sockets map[string]string
@ -62,6 +65,14 @@ func (c *GvproxyCommand) AddEndpoint(endpoint string) {
c.endpoints = append(c.endpoints, endpoint)
}
func (c *GvproxyCommand) AddServiceEndpoint(endpoint string) {
if len(c.servicesEndpoints) < 1 {
c.servicesEndpoints = []string{}
}
c.servicesEndpoints = append(c.servicesEndpoints, endpoint)
}
func (c *GvproxyCommand) AddVpnkitSocket(socket string) {
c.checkSocketsInitialized()
c.sockets["listen-vpnkit"] = socket
@ -152,6 +163,18 @@ func (c *GvproxyCommand) endpointsToCmdline() []string {
return args
}
func (c *GvproxyCommand) servicesEndpointsToCmdline() []string {
args := []string{}
for _, endpoint := range c.servicesEndpoints {
if endpoint != "" {
args = append(args, "-services", endpoint)
}
}
return args
}
// ToCmdline converts Command to a properly formatted command for gvproxy based
// on its fields
func (c *GvproxyCommand) ToCmdline() []string {
@ -160,6 +183,8 @@ func (c *GvproxyCommand) ToCmdline() []string {
// listen (endpoints)
args = append(args, c.endpointsToCmdline()...)
args = append(args, c.servicesEndpointsToCmdline()...)
// debug
if c.Debug {
args = append(args, "-debug")

2
vendor/modules.txt vendored
View File

@ -249,7 +249,7 @@ github.com/containers/common/version
# github.com/containers/conmon v2.0.20+incompatible
## explicit
github.com/containers/conmon/runner/config
# github.com/containers/gvisor-tap-vsock v0.8.3
# github.com/containers/gvisor-tap-vsock v0.8.4
## explicit; go 1.22.0
github.com/containers/gvisor-tap-vsock/pkg/types
# github.com/containers/image/v5 v5.34.1

2
winmake.ps1
View File

@ -64,7 +64,7 @@ function Win-SSHProxy {
New-Item -ItemType Directory -Force -Path "./bin/windows"
if (-Not $Version) {
$Version = "v0.8.3"
$Version = "v0.8.4"
}
curl.exe -sSL -o "./bin/windows/gvproxy.exe" --retry 5 "https://github.com/containers/gvisor-tap-vsock/releases/download/$Version/gvproxy-windowsgui.exe"
curl.exe -sSL -o "./bin/windows/win-sshproxy.exe" --retry 5 "https://github.com/containers/gvisor-tap-vsock/releases/download/$Version/win-sshproxy.exe"