opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 19:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25688 from evidolob/use-gvisor-from-gomod

Browse Source 
Use gvisor-tap-vsock version from go.mod file
This commit is contained in:
openshift-merge-bot[bot]
2025-04-22 18:34:20 +00:00
committed by GitHub
parent a75cba011e ce0617eac4
commit 7a009cc14b
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -218,7 +218,7 @@ endif
# gvisor-tap-vsock version for gvproxy.exe and win-sshproxy.exe downloads # gvisor-tap-vsock version for gvproxy.exe and win-sshproxy.exe downloads
# the upstream project ships pre-built binaries since version 0.7.1 # the upstream project ships pre-built binaries since version 0.7.1
GV_VERSION=v0.8.4 GVPROXY_VERSION=$(shell grep github.com/containers/gvisor-tap-vsock go.mod | cut -d" " -f2)
### ###
### Primary entry-point targets ### Primary entry-point targets
@ -861,12 +861,12 @@ podman-remote-release-%.zip: test/version/version ## Build podman-remote for %=$
if [[ "$(GOARCH)" != "$(NATIVE_GOARCH)" ]]; then $(MAKE) clean-binaries; fi if [[ "$(GOARCH)" != "$(NATIVE_GOARCH)" ]]; then $(MAKE) clean-binaries; fi
-rm -rf "$(tmpsubdir)" -rm -rf "$(tmpsubdir)"
# Downloads pre-built gvproxy and win-sshproxy helpers. See comment on GV_VERSION declaration # Downloads pre-built gvproxy and win-sshproxy helpers. See comment on GVPROXY_VERSION declaration
.PHONY: win-gvproxy .PHONY: win-gvproxy
win-gvproxy: test/version/version win-gvproxy: test/version/version
mkdir -p bin/windows/ mkdir -p bin/windows/
curl -sSL -o bin/windows/gvproxy.exe --retry 5 https://github.com/containers/gvisor-tap-vsock/releases/download/$(GV_VERSION)/gvproxy-windowsgui.exe curl -sSL -o bin/windows/gvproxy.exe --retry 5 https://github.com/containers/gvisor-tap-vsock/releases/download/$(GVPROXY_VERSION)/gvproxy-windowsgui.exe
curl -sSL -o bin/windows/win-sshproxy.exe --retry 5 https://github.com/containers/gvisor-tap-vsock/releases/download/$(GV_VERSION)/win-sshproxy.exe curl -sSL -o bin/windows/win-sshproxy.exe --retry 5 https://github.com/containers/gvisor-tap-vsock/releases/download/$(GVPROXY_VERSION)/win-sshproxy.exe
.PHONY: rpm .PHONY: rpm
rpm: ## Build rpm packages rpm: ## Build rpm packages

2
contrib/pkginstaller/Makefile
View File

@ -6,7 +6,7 @@ ifeq ($(ARCH), aarch64)
else else
GOARCH:=$(ARCH) GOARCH:=$(ARCH)
endif endif
GVPROXY_VERSION ?= 0.8.4 GVPROXY_VERSION ?= $(shell grep github.com/containers/gvisor-tap-vsock ../../go.mod | cut -d" " -f2)
VFKIT_VERSION ?= 0.6.1 VFKIT_VERSION ?= 0.6.1
KRUNKIT_VERSION ?= 0.2.0 KRUNKIT_VERSION ?= 0.2.0
GVPROXY_RELEASE_URL ?= https://github.com/containers/gvisor-tap-vsock/releases/download/v$(GVPROXY_VERSION)/gvproxy-darwin GVPROXY_RELEASE_URL ?= https://github.com/containers/gvisor-tap-vsock/releases/download/v$(GVPROXY_VERSION)/gvproxy-darwin

3
winmake.ps1
View File

@ -72,7 +72,8 @@ function Win-SSHProxy {
New-Item -ItemType Directory -Force -Path "./bin/windows" New-Item -ItemType Directory -Force -Path "./bin/windows"
if (-Not $Version) { if (-Not $Version) {
$Version = "v0.8.4" $match = Select-String -Path "$PSScriptRoot\go.mod" -Pattern "github.com/containers/gvisor-tap-vsock\s+(v[\d\.]+)"
$Version = $match.Matches.Groups[1].Value
} }
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/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" curl.exe -sSL -o "./bin/windows/win-sshproxy.exe" --retry 5 "https://github.com/containers/gvisor-tap-vsock/releases/download/$Version/win-sshproxy.exe"