Vendor in containers/common v0.22.0

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2020-09-11 09:51:49 -04:00
parent 397de44d48
commit cd2b2d9fae
7 changed files with 20 additions and 8 deletions

2
go.mod
View File

@ -11,7 +11,7 @@ require (
github.com/containernetworking/cni v0.8.0 github.com/containernetworking/cni v0.8.0
github.com/containernetworking/plugins v0.8.7 github.com/containernetworking/plugins v0.8.7
github.com/containers/buildah v1.15.1-0.20200813183340-0a8dc1f8064c 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/conmon v2.0.20+incompatible
github.com/containers/image/v5 v5.5.2 github.com/containers/image/v5 v5.5.2
github.com/containers/psgo v1.5.1 github.com/containers/psgo v1.5.1

4
go.sum
View File

@ -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 h1:elGbJcB3UjBdk7fBxfAzUNS3IT288U1Dzm0gmhgsnB8=
github.com/containers/buildah v1.15.1-0.20200813183340-0a8dc1f8064c/go.mod h1:+IklBLPix5wxPEWn26aDay5f5q4A5VtmNjkdyK5YVsI= 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.19.0/go.mod h1:+NUHV8V5Kmo260ja9Dxtr8ialrDnK4RNzyeEbSgmLac=
github.com/containers/common v0.21.0 h1:v2U9MrGw0vMgefQf0/uJYBsSnengxLbSORYqhCVEBs0= github.com/containers/common v0.22.0 h1:MjJIMka4pJddHsfZpQCF7jOmX6vXqMs0ojDeYmPKoSk=
github.com/containers/common v0.21.0/go.mod h1:8w8SVwc+P2p1MOnRMbSKNWXt1Iwd2bKFu2LLZx55DTM= 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 h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg=
github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I= 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= github.com/containers/image/v5 v5.5.2-0.20200902171422-1c313b2d23e0 h1:MJ0bKRn2I5I2NJlVzMU7/eP/9yfMCeWaUskl6zgY/nc=

View File

@ -658,10 +658,10 @@ func (c *NetworkConfig) Validate() error {
// ValidatePullPolicy check if the pullPolicy from CLI is valid and returns the valid enum type // 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 // if the value from CLI or containers.conf is invalid returns the error
func ValidatePullPolicy(pullPolicy string) (PullPolicy, error) { func ValidatePullPolicy(pullPolicy string) (PullPolicy, error) {
switch pullPolicy { switch strings.ToLower(pullPolicy) {
case "always": case "always":
return PullImageAlways, nil return PullImageAlways, nil
case "missing": case "missing", "ifnotpresent":
return PullImageMissing, nil return PullImageMissing, nil
case "never": case "never":
return PullImageNever, nil return PullImageNever, nil

View File

@ -65,9 +65,11 @@ func DefaultProfile() *Seccomp {
"chmod", "chmod",
"chown", "chown",
"chown32", "chown32",
"clock_adjtime",
"clock_getres", "clock_getres",
"clock_gettime", "clock_gettime",
"clock_nanosleep", "clock_nanosleep",
"clone",
"close", "close",
"connect", "connect",
"copy_file_range", "copy_file_range",
@ -89,6 +91,7 @@ func DefaultProfile() *Seccomp {
"exit", "exit",
"exit_group", "exit_group",
"faccessat", "faccessat",
"faccessat2",
"fadvise64", "fadvise64",
"fadvise64_64", "fadvise64_64",
"fallocate", "fallocate",
@ -96,6 +99,7 @@ func DefaultProfile() *Seccomp {
"fchdir", "fchdir",
"fchmod", "fchmod",
"fchmodat", "fchmodat",
"fchmodat2",
"fchown", "fchown",
"fchown32", "fchown32",
"fchownat", "fchownat",
@ -215,9 +219,11 @@ func DefaultProfile() *Seccomp {
"newfstatat", "newfstatat",
"open", "open",
"openat", "openat",
"openat2",
"pause", "pause",
"pipe", "pipe",
"pipe2", "pipe2",
"pivot_root",
"poll", "poll",
"ppoll", "ppoll",
"prctl", "prctl",

View File

@ -67,9 +67,11 @@
"chmod", "chmod",
"chown", "chown",
"chown32", "chown32",
"clock_adjtime",
"clock_getres", "clock_getres",
"clock_gettime", "clock_gettime",
"clock_nanosleep", "clock_nanosleep",
"clone",
"close", "close",
"connect", "connect",
"copy_file_range", "copy_file_range",
@ -91,6 +93,7 @@
"exit", "exit",
"exit_group", "exit_group",
"faccessat", "faccessat",
"faccessat2",
"fadvise64", "fadvise64",
"fadvise64_64", "fadvise64_64",
"fallocate", "fallocate",
@ -98,6 +101,7 @@
"fchdir", "fchdir",
"fchmod", "fchmod",
"fchmodat", "fchmodat",
"fchmodat2",
"fchown", "fchown",
"fchown32", "fchown32",
"fchownat", "fchownat",
@ -217,9 +221,11 @@
"newfstatat", "newfstatat",
"open", "open",
"openat", "openat",
"openat2",
"pause", "pause",
"pipe", "pipe",
"pipe2", "pipe2",
"pivot_root",
"poll", "poll",
"ppoll", "ppoll",
"prctl", "prctl",
@ -875,4 +881,4 @@
"excludes": {} "excludes": {}
} }
] ]
} }

View File

@ -1,4 +1,4 @@
package version package version
// Version is the version of the build. // Version is the version of the build.
const Version = "0.21.0" const Version = "0.22.0"

2
vendor/modules.txt vendored
View File

@ -84,7 +84,7 @@ github.com/containers/buildah/pkg/secrets
github.com/containers/buildah/pkg/supplemented github.com/containers/buildah/pkg/supplemented
github.com/containers/buildah/pkg/umask github.com/containers/buildah/pkg/umask
github.com/containers/buildah/util 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
github.com/containers/common/pkg/apparmor/internal/supported github.com/containers/common/pkg/apparmor/internal/supported
github.com/containers/common/pkg/auth github.com/containers/common/pkg/auth