Merge pull request #7605 from rhatdan/VENDOR

Vendor in containers/common v0.22.0

7 files changed, 20 insertions, 8 deletions

diff --git a/go.mod b/go.mod
index a4a7aa41f..85ea3f0e0 100644
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/containernetworking/cni v0.8.0
 	github.com/containernetworking/plugins v0.8.7
 	github.com/containers/buildah v1.15.1-0.20200813183340-0a8dc1f8064c
-	github.com/containers/common v0.21.0
+	github.com/containers/common v0.22.0
 	github.com/containers/conmon v2.0.20+incompatible
 	github.com/containers/image/v5 v5.5.2
 	github.com/containers/psgo v1.5.1
diff --git a/go.sum b/go.sum
index 9bb058dc8..7d9a56e35 100644
--- a/go.sum
+++ b/go.sum
@@ -71,8 +71,8 @@ github.com/containernetworking/plugins v0.8.7/go.mod h1:R7lXeZaBzpfqapcAbHRW8/CY
 github.com/containers/buildah v1.15.1-0.20200813183340-0a8dc1f8064c h1:elGbJcB3UjBdk7fBxfAzUNS3IT288U1Dzm0gmhgsnB8=
 github.com/containers/buildah v1.15.1-0.20200813183340-0a8dc1f8064c/go.mod h1:+IklBLPix5wxPEWn26aDay5f5q4A5VtmNjkdyK5YVsI=
 github.com/containers/common v0.19.0/go.mod h1:+NUHV8V5Kmo260ja9Dxtr8ialrDnK4RNzyeEbSgmLac=
-github.com/containers/common v0.21.0 h1:v2U9MrGw0vMgefQf0/uJYBsSnengxLbSORYqhCVEBs0=
-github.com/containers/common v0.21.0/go.mod h1:8w8SVwc+P2p1MOnRMbSKNWXt1Iwd2bKFu2LLZx55DTM=
+github.com/containers/common v0.22.0 h1:MjJIMka4pJddHsfZpQCF7jOmX6vXqMs0ojDeYmPKoSk=
+github.com/containers/common v0.22.0/go.mod h1:qsLcLHM7ha5Nc+JDp5duBwfwEfrnlfjXL/K8HO96QHw=
 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.5.2-0.20200902171422-1c313b2d23e0 h1:MJ0bKRn2I5I2NJlVzMU7/eP/9yfMCeWaUskl6zgY/nc=
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"
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 7af0f1110..15291feda 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -84,7 +84,7 @@ github.com/containers/buildah/pkg/secrets
 github.com/containers/buildah/pkg/supplemented
 github.com/containers/buildah/pkg/umask
 github.com/containers/buildah/util
-# github.com/containers/common v0.21.0
+# github.com/containers/common v0.22.0
 github.com/containers/common/pkg/apparmor
 github.com/containers/common/pkg/apparmor/internal/supported
 github.com/containers/common/pkg/auth