summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2022-07-18 13:25:01 -0400
committerMatthew Heon <matthew.heon@pm.me>2022-07-26 13:35:01 -0400
commit76fa8044723e41df7b9348f88e50d4d7c5f4d7c0 (patch)
tree7dbdbfbdd6924fc6001685fbc97c4fa31d87908c /vendor
parente89550bcd37f4f201d181c48b93f9f0d4ffce3ea (diff)
downloadpodman-76fa8044723e41df7b9348f88e50d4d7c5f4d7c0.tar.gz
podman-76fa8044723e41df7b9348f88e50d4d7c5f4d7c0.tar.bz2
podman-76fa8044723e41df7b9348f88e50d4d7c5f4d7c0.zip
Vendor in latests containers/storage and opencontainers/runtime-tools
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor')
-rw-r--r--vendor/github.com/containers/common/libimage/filters.go1
-rw-r--r--vendor/github.com/containers/common/libnetwork/util/filters.go5
-rw-r--r--vendor/github.com/containers/common/pkg/cgroups/systemd_linux.go6
-rw-r--r--vendor/github.com/containers/common/pkg/filters/filters.go18
-rw-r--r--vendor/github.com/opencontainers/runtime-tools/generate/generate.go19
-rw-r--r--vendor/github.com/opencontainers/runtime-tools/generate/seccomp/seccomp_default.go1
-rw-r--r--vendor/modules.txt4
7 files changed, 45 insertions, 9 deletions
diff --git a/vendor/github.com/containers/common/libimage/filters.go b/vendor/github.com/containers/common/libimage/filters.go
index 3968c5fdc..f387edf58 100644
--- a/vendor/github.com/containers/common/libimage/filters.go
+++ b/vendor/github.com/containers/common/libimage/filters.go
@@ -159,7 +159,6 @@ func (r *Runtime) compileImageFilters(ctx context.Context, options *ListImagesOp
case "label":
filter = filterLabel(ctx, value)
-
case "readonly":
readOnly, err := r.bool(duplicate, key, value)
if err != nil {
diff --git a/vendor/github.com/containers/common/libnetwork/util/filters.go b/vendor/github.com/containers/common/libnetwork/util/filters.go
index a8ef8a413..2f1e4a21f 100644
--- a/vendor/github.com/containers/common/libnetwork/util/filters.go
+++ b/vendor/github.com/containers/common/libnetwork/util/filters.go
@@ -65,7 +65,10 @@ func createPruneFilterFuncs(key string, filterValues []string) (types.FilterFunc
return func(net types.Network) bool {
return filters.MatchLabelFilters(filterValues, net.Labels)
}, nil
-
+ case "label!":
+ return func(net types.Network) bool {
+ return !filters.MatchLabelFilters(filterValues, net.Labels)
+ }, nil
case "until":
until, err := filters.ComputeUntilTimestamp(filterValues)
if err != nil {
diff --git a/vendor/github.com/containers/common/pkg/cgroups/systemd_linux.go b/vendor/github.com/containers/common/pkg/cgroups/systemd_linux.go
index e0f73b4e7..92b87fdaf 100644
--- a/vendor/github.com/containers/common/pkg/cgroups/systemd_linux.go
+++ b/vendor/github.com/containers/common/pkg/cgroups/systemd_linux.go
@@ -201,7 +201,11 @@ func resourcesToProps(res *configs.Resources, v2 bool) (map[string]uint64, map[s
// Blkio
if res.BlkioWeight > 0 {
- uMap["BlockIOWeight"] = uint64(res.BlkioWeight)
+ if v2 {
+ uMap["IOWeight"] = uint64(res.BlkioWeight)
+ } else {
+ uMap["BlockIOWeight"] = uint64(res.BlkioWeight)
+ }
}
// systemd requires the paths to be in the form /dev/{block, char}/major:minor
diff --git a/vendor/github.com/containers/common/pkg/filters/filters.go b/vendor/github.com/containers/common/pkg/filters/filters.go
index dee66107f..f8b0066e5 100644
--- a/vendor/github.com/containers/common/pkg/filters/filters.go
+++ b/vendor/github.com/containers/common/pkg/filters/filters.go
@@ -4,6 +4,7 @@ import (
"encoding/json"
"fmt"
"net/http"
+ "path/filepath"
"strings"
"time"
@@ -111,11 +112,24 @@ outer:
filterValue = ""
}
for labelKey, labelValue := range labels {
- if labelKey == filterKey && (filterValue == "" || labelValue == filterValue) {
- continue outer
+ if filterValue == "" || labelValue == filterValue {
+ if labelKey == filterKey || matchPattern(filterKey, labelKey) {
+ continue outer
+ }
}
}
return false
}
return true
}
+
+func matchPattern(pattern string, value string) bool {
+ if strings.Contains(pattern, "*") {
+ filter := fmt.Sprintf("*%s*", pattern)
+ filter = strings.ReplaceAll(filter, string(filepath.Separator), "|")
+ newName := strings.ReplaceAll(value, string(filepath.Separator), "|")
+ match, _ := filepath.Match(filter, newName)
+ return match
+ }
+ return false
+}
diff --git a/vendor/github.com/opencontainers/runtime-tools/generate/generate.go b/vendor/github.com/opencontainers/runtime-tools/generate/generate.go
index be1f027bf..f4e77ee1e 100644
--- a/vendor/github.com/opencontainers/runtime-tools/generate/generate.go
+++ b/vendor/github.com/opencontainers/runtime-tools/generate/generate.go
@@ -42,7 +42,7 @@ type ExportOptions struct {
// New creates a configuration Generator with the default
// configuration for the target operating system.
func New(os string) (generator Generator, err error) {
- if os != "linux" && os != "solaris" && os != "windows" {
+ if os != "linux" && os != "solaris" && os != "windows" && os != "freebsd" {
return generator, fmt.Errorf("no defaults configured for %s", os)
}
@@ -72,7 +72,7 @@ func New(os string) (generator Generator, err error) {
}
}
- if os == "linux" || os == "solaris" {
+ if os == "linux" || os == "solaris" || os == "freebsd" {
config.Process.User = rspec.User{}
config.Process.Env = []string{
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
@@ -237,6 +237,21 @@ func New(os string) (generator Generator, err error) {
},
Seccomp: seccomp.DefaultProfile(&config),
}
+ } else if os == "freebsd" {
+ config.Mounts = []rspec.Mount{
+ {
+ Destination: "/dev",
+ Type: "devfs",
+ Source: "devfs",
+ Options: []string{"ruleset=4"},
+ },
+ {
+ Destination: "/dev/fd",
+ Type: "fdescfs",
+ Source: "fdesc",
+ Options: []string{},
+ },
+ }
}
envCache := map[string]int{}
diff --git a/vendor/github.com/opencontainers/runtime-tools/generate/seccomp/seccomp_default.go b/vendor/github.com/opencontainers/runtime-tools/generate/seccomp/seccomp_default.go
index 8a8dc3970..12bc44d6d 100644
--- a/vendor/github.com/opencontainers/runtime-tools/generate/seccomp/seccomp_default.go
+++ b/vendor/github.com/opencontainers/runtime-tools/generate/seccomp/seccomp_default.go
@@ -303,6 +303,7 @@ func DefaultProfile(rs *specs.Spec) *rspec.LinuxSeccomp {
"stat64",
"statfs",
"statfs64",
+ "statx",
"symlink",
"symlinkat",
"sync",
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 3da12dbd8..70a9f197b 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -114,7 +114,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.48.1-0.20220715075726-2ac10faca05a
+# github.com/containers/common v0.48.1-0.20220718075257-ecddf87b3840
## explicit
github.com/containers/common/libimage
github.com/containers/common/libimage/define
@@ -599,7 +599,7 @@ github.com/opencontainers/runc/libcontainer/utils
# github.com/opencontainers/runtime-spec v1.0.3-0.20211214071223-8958f93039ab
## explicit
github.com/opencontainers/runtime-spec/specs-go
-# github.com/opencontainers/runtime-tools v0.9.1-0.20220110225228-7e2d60f1e41f
+# github.com/opencontainers/runtime-tools v0.9.1-0.20220714195903-17b3287fafb7
## explicit
github.com/opencontainers/runtime-tools/error
github.com/opencontainers/runtime-tools/filepath