From 50501a945f4769ecf2bba1d523f186935ab2a96b Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Thu, 10 Aug 2023 09:51:46 +0200 Subject: [PATCH] [4.6] vendor c/common v0.55.3 Signed-off-by: Valentin Rothberg --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/containers/common/pkg/config/config.go | 2 +- .../github.com/containers/common/pkg/config/config_darwin.go | 3 +++ .../github.com/containers/common/pkg/config/config_freebsd.go | 3 +++ .../github.com/containers/common/pkg/config/config_linux.go | 3 +++ .../github.com/containers/common/pkg/config/config_windows.go | 3 +++ .../github.com/containers/common/pkg/config/containers.conf | 2 +- .../containers/common/pkg/config/containers.conf-freebsd | 2 +- vendor/github.com/containers/common/pkg/config/default.go | 2 +- vendor/github.com/containers/common/version/version.go | 2 +- vendor/modules.txt | 2 +- 12 files changed, 21 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index eb37776096..408295de9e 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/containernetworking/cni v1.1.2 github.com/containernetworking/plugins v1.3.0 github.com/containers/buildah v1.31.0 - github.com/containers/common v0.55.2 + github.com/containers/common v0.55.3 github.com/containers/conmon v2.0.20+incompatible github.com/containers/image/v5 v5.26.1 github.com/containers/libhvee v0.0.5 diff --git a/go.sum b/go.sum index b85d9c9330..1885179946 100644 --- a/go.sum +++ b/go.sum @@ -241,8 +241,8 @@ github.com/containernetworking/plugins v1.3.0 h1:QVNXMT6XloyMUoO2wUOqWTC1hWFV62Q github.com/containernetworking/plugins v1.3.0/go.mod h1:Pc2wcedTQQCVuROOOaLBPPxrEXqqXBFt3cZ+/yVg6l0= github.com/containers/buildah v1.31.0 h1:NgVtEyTsR7e/XLTSJElbInnGPjdDGNHqLKADPHzaUGg= github.com/containers/buildah v1.31.0/go.mod h1:tcgXcGhqw3kw49RapUS7tskEhxKLG4eVFJKA/QzgwNU= -github.com/containers/common v0.55.2 h1:Cd+vmkUPDrPvL2v4Te1Wew6SIZdn4/XiyiBRT9IbcGg= -github.com/containers/common v0.55.2/go.mod h1:ZKPllYOZ2xj2rgWRdnHHVvWg6ru4BT28En8mO8DMMPk= +github.com/containers/common v0.55.3 h1:mhNQRU4OgW1wpmmKMFSYRn42+hr8SEVSPFdKML3WZik= +github.com/containers/common v0.55.3/go.mod h1:ZKPllYOZ2xj2rgWRdnHHVvWg6ru4BT28En8mO8DMMPk= 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/image/v5 v5.26.1 h1:8y3xq8GO/6y8FR+nAedHPsAFiAtOrab9qHTBpbqaX8g= diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go index a408b4fd48..b5f9501181 100644 --- a/vendor/github.com/containers/common/pkg/config/config.go +++ b/vendor/github.com/containers/common/pkg/config/config.go @@ -51,7 +51,7 @@ const ( BoltDBStateStore RuntimeStateStore = iota ) -var validImageVolumeModes = []string{"bind", "tmpfs", "ignore"} +var validImageVolumeModes = []string{_typeBind, "tmpfs", "ignore"} // ProxyEnv is a list of Proxy Environment variables var ProxyEnv = []string{ diff --git a/vendor/github.com/containers/common/pkg/config/config_darwin.go b/vendor/github.com/containers/common/pkg/config/config_darwin.go index 18c4662102..eb83733d46 100644 --- a/vendor/github.com/containers/common/pkg/config/config_darwin.go +++ b/vendor/github.com/containers/common/pkg/config/config_darwin.go @@ -14,6 +14,9 @@ const ( // DefaultSignaturePolicyPath is the default value for the // policy.json file. DefaultSignaturePolicyPath = "/etc/containers/policy.json" + + // Mount type for mounting host dir + _typeBind = "bind" ) // podman remote clients on darwin cannot use unshare.isRootless() to determine the configuration file locations. diff --git a/vendor/github.com/containers/common/pkg/config/config_freebsd.go b/vendor/github.com/containers/common/pkg/config/config_freebsd.go index 903f0b47ce..48bb0994ce 100644 --- a/vendor/github.com/containers/common/pkg/config/config_freebsd.go +++ b/vendor/github.com/containers/common/pkg/config/config_freebsd.go @@ -14,6 +14,9 @@ const ( // DefaultSignaturePolicyPath is the default value for the // policy.json file. DefaultSignaturePolicyPath = "/usr/local/etc/containers/policy.json" + + // Mount type for mounting host dir + _typeBind = "nullfs" ) // podman remote clients on freebsd cannot use unshare.isRootless() to determine the configuration file locations. diff --git a/vendor/github.com/containers/common/pkg/config/config_linux.go b/vendor/github.com/containers/common/pkg/config/config_linux.go index 4ce5d03209..f294402a3e 100644 --- a/vendor/github.com/containers/common/pkg/config/config_linux.go +++ b/vendor/github.com/containers/common/pkg/config/config_linux.go @@ -17,6 +17,9 @@ const ( // DefaultSignaturePolicyPath is the default value for the // policy.json file. DefaultSignaturePolicyPath = "/etc/containers/policy.json" + + // Mount type for mounting host dir + _typeBind = "bind" ) func selinuxEnabled() bool { diff --git a/vendor/github.com/containers/common/pkg/config/config_windows.go b/vendor/github.com/containers/common/pkg/config/config_windows.go index b5838072eb..67f0aab238 100644 --- a/vendor/github.com/containers/common/pkg/config/config_windows.go +++ b/vendor/github.com/containers/common/pkg/config/config_windows.go @@ -12,6 +12,9 @@ const ( // DefaultSignaturePolicyPath is the default value for the // policy.json file. DefaultSignaturePolicyPath = "/etc/containers/policy.json" + + // Mount type for mounting host dir + _typeBind = "bind" ) // podman remote clients on windows cannot use unshare.isRootless() to determine the configuration file locations. diff --git a/vendor/github.com/containers/common/pkg/config/containers.conf b/vendor/github.com/containers/common/pkg/config/containers.conf index ec881f2fc2..a106fd6864 100644 --- a/vendor/github.com/containers/common/pkg/config/containers.conf +++ b/vendor/github.com/containers/common/pkg/config/containers.conf @@ -377,7 +377,7 @@ default_sysctls = [ #active_service = "production" # The compression format to use when pushing an image. -# Valid options are: `gzip`, `zstd` and `zstd:chunked`. +# Valid options are: `gzip` and `zstd`. # #compression_format = "gzip" diff --git a/vendor/github.com/containers/common/pkg/config/containers.conf-freebsd b/vendor/github.com/containers/common/pkg/config/containers.conf-freebsd index 5e187893b2..10586d60de 100644 --- a/vendor/github.com/containers/common/pkg/config/containers.conf-freebsd +++ b/vendor/github.com/containers/common/pkg/config/containers.conf-freebsd @@ -307,7 +307,7 @@ default_sysctls = [ #active_service = production # The compression format to use when pushing an image. -# Valid options are: `gzip`, `zstd` and `zstd:chunked`. +# Valid options are: `gzip` and `zstd`. # #compression_format = "gzip" diff --git a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go index 1279209977..985335760d 100644 --- a/vendor/github.com/containers/common/pkg/config/default.go +++ b/vendor/github.com/containers/common/pkg/config/default.go @@ -28,7 +28,7 @@ const ( _defaultTransport = "docker://" // _defaultImageVolumeMode is a mode to handle built-in image volumes. - _defaultImageVolumeMode = "bind" + _defaultImageVolumeMode = _typeBind ) var ( diff --git a/vendor/github.com/containers/common/version/version.go b/vendor/github.com/containers/common/version/version.go index 71d6aafa90..0831bdea07 100644 --- a/vendor/github.com/containers/common/version/version.go +++ b/vendor/github.com/containers/common/version/version.go @@ -1,4 +1,4 @@ package version // Version is the version of the build. -const Version = "0.55.2" +const Version = "0.55.3" diff --git a/vendor/modules.txt b/vendor/modules.txt index 42190d0f7e..41ee00324a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -128,7 +128,7 @@ github.com/containers/buildah/pkg/rusage github.com/containers/buildah/pkg/sshagent github.com/containers/buildah/pkg/util github.com/containers/buildah/util -# github.com/containers/common v0.55.2 +# github.com/containers/common v0.55.3 ## explicit; go 1.18 github.com/containers/common/libimage github.com/containers/common/libimage/define