From 2dc02c3f332769c93961ef02cba4cfda8f33792a Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Fri, 13 Dec 2024 10:10:07 +0100 Subject: [PATCH] go.mod: Update podman --- go.mod | 2 +- go.sum | 4 ++-- .../containers/podman/v5/pkg/machine/shim/networking.go | 2 ++ vendor/modules.txt | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 9dde6d7c..b1f7b505 100644 --- a/go.mod +++ b/go.mod @@ -179,6 +179,6 @@ require ( tags.cncf.io/container-device-interface v0.8.0 // indirect ) -replace github.com/containers/podman/v5 => github.com/cfergeau/podman/v5 v5.0.0-20241127161353-592fb5161f59 +replace github.com/containers/podman/v5 => github.com/cfergeau/podman/v5 v5.0.0-20241213090455-63ea6fa04b45 replace github.com/crc-org/machine => github.com/cfergeau/machine v0.0.0-20241127155529-1b8b9b8d1078 diff --git a/go.sum b/go.sum index 3ab5667d..a28ca8b2 100644 --- a/go.sum +++ b/go.sum @@ -35,8 +35,8 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cfergeau/machine v0.0.0-20241127155529-1b8b9b8d1078 h1:KpgRncgq6ZiWDnLe6R58dJjd6QSuU7RDqRrpl11Dxcg= github.com/cfergeau/machine v0.0.0-20241127155529-1b8b9b8d1078/go.mod h1:trWeQimjfE3dJ8qWOxI4ePtYm13aecK42bf01s6h/Nc= -github.com/cfergeau/podman/v5 v5.0.0-20241127161353-592fb5161f59 h1:ftTxlR1SCKLTyvJraZUVxO01+i9hvTVC3r7osaY5/HA= -github.com/cfergeau/podman/v5 v5.0.0-20241127161353-592fb5161f59/go.mod h1:aSSwTYeD7i084QIiiTIFpolFyCP28H1h08AY22VrKIo= +github.com/cfergeau/podman/v5 v5.0.0-20241213090455-63ea6fa04b45 h1:ydSafv0c92fgIJsrEu8ay6ko0EqhX9kz3YpCcfrg/zY= +github.com/cfergeau/podman/v5 v5.0.0-20241213090455-63ea6fa04b45/go.mod h1:DTVzcjHg3KA5RwO36cd+nmJvfBPZKcfLugk7wL47ql0= github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0= diff --git a/vendor/github.com/containers/podman/v5/pkg/machine/shim/networking.go b/vendor/github.com/containers/podman/v5/pkg/machine/shim/networking.go index a7262d56..aa2af1ca 100644 --- a/vendor/github.com/containers/podman/v5/pkg/machine/shim/networking.go +++ b/vendor/github.com/containers/podman/v5/pkg/machine/shim/networking.go @@ -69,6 +69,8 @@ func startHostForwarder(mc *vmconfigs.MachineConfig, provider vmconfigs.VMProvid cmd.AddForwardUser(forwardUser) cmd.AddForwardIdentity(mc.SSH.IdentityPath) } + serviceEndpoint := filepath.Join(runDir.GetPath(), "gv.sock") + cmd.AddServiceEndpoint(fmt.Sprintf("unix://%s", serviceEndpoint)) if logrus.IsLevelEnabled(logrus.DebugLevel) { cmd.Debug = true diff --git a/vendor/modules.txt b/vendor/modules.txt index fd9db4be..c7668ef9 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -251,7 +251,7 @@ github.com/containers/ocicrypt/keywrap/pkcs7 github.com/containers/ocicrypt/spec github.com/containers/ocicrypt/utils github.com/containers/ocicrypt/utils/keyprovider -# github.com/containers/podman/v5 v5.3.1 => github.com/cfergeau/podman/v5 v5.0.0-20241127161353-592fb5161f59 +# github.com/containers/podman/v5 v5.3.1 => github.com/cfergeau/podman/v5 v5.0.0-20241213090455-63ea6fa04b45 ## explicit; go 1.22.6 github.com/containers/podman/v5/libpod/define github.com/containers/podman/v5/pkg/errorhandling @@ -1075,5 +1075,5 @@ gopkg.in/yaml.v3 # tags.cncf.io/container-device-interface v0.8.0 ## explicit; go 1.20 tags.cncf.io/container-device-interface/pkg/parser -# github.com/containers/podman/v5 => github.com/cfergeau/podman/v5 v5.0.0-20241127161353-592fb5161f59 +# github.com/containers/podman/v5 => github.com/cfergeau/podman/v5 v5.0.0-20241213090455-63ea6fa04b45 # github.com/crc-org/machine => github.com/cfergeau/machine v0.0.0-20241127155529-1b8b9b8d1078