From 6714b6302d48776a3bb576fff91ca90f096d9357 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 00:16:18 +0000 Subject: [PATCH] fix(deps): update github.com/containers/common digest to 05b2e1f Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- .../containers/common/pkg/config/default_windows.go | 8 +++++++- vendor/modules.txt | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 9c12b684e2..cefa660bdf 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/checkpoint-restore/go-criu/v7 v7.1.0 github.com/containernetworking/plugins v1.5.1 github.com/containers/buildah v1.37.0 - github.com/containers/common v0.60.1-0.20240805120402-c0cc6b7a78f1 + github.com/containers/common v0.60.1-0.20240806133927-05b2e1fd7cd0 github.com/containers/conmon v2.0.20+incompatible github.com/containers/gvisor-tap-vsock v0.7.4 github.com/containers/image/v5 v5.32.0 diff --git a/go.sum b/go.sum index e63ab1aa1c..ee029651c9 100644 --- a/go.sum +++ b/go.sum @@ -79,8 +79,8 @@ github.com/containernetworking/plugins v1.5.1 h1:T5ji+LPYjjgW0QM+KyrigZbLsZ8jaX+ github.com/containernetworking/plugins v1.5.1/go.mod h1:MIQfgMayGuHYs0XdNudf31cLLAC+i242hNm6KuDGqCM= github.com/containers/buildah v1.37.0 h1:jvHwu1vIwIqnHyOSg9eef9Apdpry+5oWLrm43gdf8Rk= github.com/containers/buildah v1.37.0/go.mod h1:MKd79tkluMf6vtH06SedhBQK5OB7E0pFVIuiTTw3dJk= -github.com/containers/common v0.60.1-0.20240805120402-c0cc6b7a78f1 h1:sajCXeHQuD1rSqJ1A19FL62QJOELbPkMlRNjRJktdS8= -github.com/containers/common v0.60.1-0.20240805120402-c0cc6b7a78f1/go.mod h1:mWJvbq/MQ8smLKiVwGkcEwzNO+TiFVWA3gpJ2teqgIs= +github.com/containers/common v0.60.1-0.20240806133927-05b2e1fd7cd0 h1:d4oujEs1vClWSRqGEa6OGjh7iKtmuVY8ybrp6JJOt6w= +github.com/containers/common v0.60.1-0.20240806133927-05b2e1fd7cd0/go.mod h1:mWJvbq/MQ8smLKiVwGkcEwzNO+TiFVWA3gpJ2teqgIs= 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 h1:iOtr/KEi+r599OOx1+9Qbss91jD5yxh1HO35MKTdths= diff --git a/vendor/github.com/containers/common/pkg/config/default_windows.go b/vendor/github.com/containers/common/pkg/config/default_windows.go index 70627cbda8..610aa122bf 100644 --- a/vendor/github.com/containers/common/pkg/config/default_windows.go +++ b/vendor/github.com/containers/common/pkg/config/default_windows.go @@ -42,11 +42,17 @@ func getLibpodTmpDir() string { } // getDefaultMachineVolumes returns default mounted volumes (possibly with env vars, which will be expanded) +// It is executed only if the machine provider is Hyper-V and it mimics WSL +// behavior where the host %USERPROFILE% drive (e.g. C:\) is automatically +// mounted in the guest under /mnt/ (e.g. /mnt/c/) func getDefaultMachineVolumes() []string { hd := homedir.Get() vol := filepath.VolumeName(hd) hostMnt := filepath.ToSlash(strings.TrimPrefix(hd, vol)) - return []string{fmt.Sprintf("%s:%s", hd, hostMnt)} + return []string{ + fmt.Sprintf("%s:%s", hd, hostMnt), + fmt.Sprintf("%s:%s", vol+"\\", "/mnt/"+strings.ToLower(vol[0:1])), + } } func getDefaultComposeProviders() []string { diff --git a/vendor/modules.txt b/vendor/modules.txt index 279b67e452..b849001595 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -170,7 +170,7 @@ github.com/containers/buildah/pkg/sshagent github.com/containers/buildah/pkg/util github.com/containers/buildah/pkg/volumes github.com/containers/buildah/util -# github.com/containers/common v0.60.1-0.20240805120402-c0cc6b7a78f1 +# github.com/containers/common v0.60.1-0.20240806133927-05b2e1fd7cd0 ## explicit; go 1.21.0 github.com/containers/common/internal github.com/containers/common/internal/attributedstring