build: Update gvisor-tap-vsock to 0.7.4

This contains a fix for a gvproxy crash on macos on fast connections with heavy network load. This should fix containers#23114 Signed-off-by: Christophe Fergeau <[email protected]>
giuseppe · Jul 25, 2024 · ca740b2 · ca740b2
1 parent 2e20681
commit ca740b2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -220,7 +220,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.7.3
+GV_VERSION=v0.7.4
 
 ###
 ### Primary entry-point targets

diff --git a/contrib/pkginstaller/Makefile b/contrib/pkginstaller/Makefile
@@ -6,7 +6,7 @@ ifeq ($(ARCH), aarch64)
 else
 	GOARCH:=$(ARCH)
 endif
-GVPROXY_VERSION ?= 0.7.3
+GVPROXY_VERSION ?= 0.7.4
 VFKIT_VERSION ?= 0.5.1
 KRUNKIT_VERSION ?= 0.1.2
 GVPROXY_RELEASE_URL ?= https://github.com/containers/gvisor-tap-vsock/releases/download/v$(GVPROXY_VERSION)/gvproxy-darwin

diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/containers/buildah v1.36.1-0.20240715114330-4a82e0a3f382
 	github.com/containers/common v0.59.1-0.20240717135212-fdbae3a180cb
 	github.com/containers/conmon v2.0.20+incompatible
-	github.com/containers/gvisor-tap-vsock v0.7.4-0.20240515153903-01a1a0cd3f70
+	github.com/containers/gvisor-tap-vsock v0.7.4
 	github.com/containers/image/v5 v5.31.1-0.20240711123249-1dbd8fbbe516
 	github.com/containers/libhvee v0.7.1
 	github.com/containers/ocicrypt v1.2.0

diff --git a/go.sum b/go.sum
@@ -83,8 +83,8 @@ github.com/containers/common v0.59.1-0.20240717135212-fdbae3a180cb h1:9OgHqOACzW
 github.com/containers/common v0.59.1-0.20240717135212-fdbae3a180cb/go.mod h1:KrQ9y5qa7TBVzp7qs7I1MVi6Uxntu0hM5wjd5bmvMnM=
 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.7.4-0.20240515153903-01a1a0cd3f70 h1:aACcXSIgcuPq5QdNZZ8B53BCdhqYvw33/8QmZWJATvg=
-github.com/containers/gvisor-tap-vsock v0.7.4-0.20240515153903-01a1a0cd3f70/go.mod h1:v2JP4sZFltFJ8smHLVm12Ng3jHetrNh565ZwWpB5pzs=
+github.com/containers/gvisor-tap-vsock v0.7.4 h1:iOtr/KEi+r599OOx1+9Qbss91jD5yxh1HO35MKTdths=
+github.com/containers/gvisor-tap-vsock v0.7.4/go.mod h1:orUOSdxU/IGEOxhecu2i7EzV7k7e2TgQlyCBfUngS0A=
 github.com/containers/image/v5 v5.31.1-0.20240711123249-1dbd8fbbe516 h1:BVyB11XLbT7s0tMF1qzdc5R04gO2BRAdjbftRwNoLXM=
 github.com/containers/image/v5 v5.31.1-0.20240711123249-1dbd8fbbe516/go.mod h1:iAUT9Iy/z0QPrYeILorryErMUxm4GlRzBE0Yz65l/uE=
 github.com/containers/libhvee v0.7.1 h1:dWGF5GLq9DZvXo3P8aDp3cNieL5eCaSell4UmeA/jY4=

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -239,8 +239,8 @@ 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.7.4-0.20240515153903-01a1a0cd3f70
-## explicit; go 1.20
+# github.com/containers/gvisor-tap-vsock v0.7.4
+## explicit; go 1.21
 github.com/containers/gvisor-tap-vsock/pkg/types
 # github.com/containers/image/v5 v5.31.1-0.20240711123249-1dbd8fbbe516
 ## explicit; go 1.21.0