diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-11 12:10:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-11 12:10:39 -0400 |
| commit | 4f040070b6e9e2213b1fb6daa1502353c90e172d (patch) | |
| tree | 07b80d3eb3c97707cdec9c8b6b5fd318c69c3b8c /vendor/github.com | |
| parent | 71787765f5524df4454fb368012b97604db49d58 (diff) | |
| parent | cd2b2d9fae0c1dbcf8f4222ba461d5cc8223dd51 (diff) | |
| download | podman-4f040070b6e9e2213b1fb6daa1502353c90e172d.tar.gz podman-4f040070b6e9e2213b1fb6daa1502353c90e172d.tar.bz2 podman-4f040070b6e9e2213b1fb6daa1502353c90e172d.zip | |
Merge pull request #7605 from rhatdan/VENDOR
Vendor in containers/common v0.22.0
Diffstat (limited to 'vendor/github.com')
| -rw-r--r-- | vendor/github.com/containers/common/pkg/config/config.go | 4 | ||||
| -rw-r--r-- | vendor/github.com/containers/common/pkg/seccomp/default_linux.go (renamed from vendor/github.com/containers/common/pkg/seccomp/seccomp_default_linux.go) | 6 | ||||
| -rw-r--r-- | vendor/github.com/containers/common/pkg/seccomp/seccomp.json | 8 | ||||
| -rw-r--r-- | vendor/github.com/containers/common/version/version.go | 2 |
4 files changed, 16 insertions, 4 deletions
diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go index 78811b47a..568f43c17 100644 --- a/vendor/github.com/containers/common/pkg/config/config.go +++ b/vendor/github.com/containers/common/pkg/config/config.go @@ -658,10 +658,10 @@ func (c *NetworkConfig) Validate() error { // ValidatePullPolicy check if the pullPolicy from CLI is valid and returns the valid enum type // if the value from CLI or containers.conf is invalid returns the error func ValidatePullPolicy(pullPolicy string) (PullPolicy, error) { - switch pullPolicy { + switch strings.ToLower(pullPolicy) { case "always": return PullImageAlways, nil - case "missing": + case "missing", "ifnotpresent": return PullImageMissing, nil case "never": return PullImageNever, nil diff --git a/vendor/github.com/containers/common/pkg/seccomp/seccomp_default_linux.go b/vendor/github.com/containers/common/pkg/seccomp/default_linux.go index f12cf02c9..e2a2c68f1 100644 --- a/vendor/github.com/containers/common/pkg/seccomp/seccomp_default_linux.go +++ b/vendor/github.com/containers/common/pkg/seccomp/default_linux.go @@ -65,9 +65,11 @@ func DefaultProfile() *Seccomp { "chmod", "chown", "chown32", + "clock_adjtime", "clock_getres", "clock_gettime", "clock_nanosleep", + "clone", "close", "connect", "copy_file_range", @@ -89,6 +91,7 @@ func DefaultProfile() *Seccomp { "exit", "exit_group", "faccessat", + "faccessat2", "fadvise64", "fadvise64_64", "fallocate", @@ -96,6 +99,7 @@ func DefaultProfile() *Seccomp { "fchdir", "fchmod", "fchmodat", + "fchmodat2", "fchown", "fchown32", "fchownat", @@ -215,9 +219,11 @@ func DefaultProfile() *Seccomp { "newfstatat", "open", "openat", + "openat2", "pause", "pipe", "pipe2", + "pivot_root", "poll", "ppoll", "prctl", diff --git a/vendor/github.com/containers/common/pkg/seccomp/seccomp.json b/vendor/github.com/containers/common/pkg/seccomp/seccomp.json index 06b39024a..a8b87175e 100644 --- a/vendor/github.com/containers/common/pkg/seccomp/seccomp.json +++ b/vendor/github.com/containers/common/pkg/seccomp/seccomp.json @@ -67,9 +67,11 @@ "chmod", "chown", "chown32", + "clock_adjtime", "clock_getres", "clock_gettime", "clock_nanosleep", + "clone", "close", "connect", "copy_file_range", @@ -91,6 +93,7 @@ "exit", "exit_group", "faccessat", + "faccessat2", "fadvise64", "fadvise64_64", "fallocate", @@ -98,6 +101,7 @@ "fchdir", "fchmod", "fchmodat", + "fchmodat2", "fchown", "fchown32", "fchownat", @@ -217,9 +221,11 @@ "newfstatat", "open", "openat", + "openat2", "pause", "pipe", "pipe2", + "pivot_root", "poll", "ppoll", "prctl", @@ -875,4 +881,4 @@ "excludes": {} } ] -}
\ No newline at end of file +} diff --git a/vendor/github.com/containers/common/version/version.go b/vendor/github.com/containers/common/version/version.go index 1f05ea3d9..7fcbf40a1 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.21.0" +const Version = "0.22.0" |