Vendor in common 0.33.1
As per title Signed-off-by: Ashley Cui <acui@redhat.com>
This commit is contained in:
		
							parent
							
								
									9473dda87c
								
							
						
					
					
						commit
						566a923950
					
				
							
								
								
									
										2
									
								
								go.mod
								
								
								
								
							
							
						
						
									
										2
									
								
								go.mod
								
								
								
								
							| 
						 | 
				
			
			@ -11,7 +11,7 @@ require (
 | 
			
		|||
	github.com/containernetworking/cni v0.8.0
 | 
			
		||||
	github.com/containernetworking/plugins v0.9.0
 | 
			
		||||
	github.com/containers/buildah v1.18.1-0.20201222143428-b9fdee076426
 | 
			
		||||
	github.com/containers/common v0.33.0
 | 
			
		||||
	github.com/containers/common v0.33.1
 | 
			
		||||
	github.com/containers/conmon v2.0.20+incompatible
 | 
			
		||||
	github.com/containers/image/v5 v5.9.0
 | 
			
		||||
	github.com/containers/psgo v1.5.2
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										4
									
								
								go.sum
								
								
								
								
							
							
						
						
									
										4
									
								
								go.sum
								
								
								
								
							| 
						 | 
				
			
			@ -99,8 +99,8 @@ github.com/containernetworking/plugins v0.9.0/go.mod h1:dbWv4dI0QrBGuVgj+TuVQ6wJ
 | 
			
		|||
github.com/containers/buildah v1.18.1-0.20201222143428-b9fdee076426 h1:hgNSbIO7KUJ9jHSEHwM5D2qii5t/5f2yfxZepJFYm18=
 | 
			
		||||
github.com/containers/buildah v1.18.1-0.20201222143428-b9fdee076426/go.mod h1:AM7JcGaUtTJgR6fZL2zBg5PCSCSDiX/sNdMSyrkoJ10=
 | 
			
		||||
github.com/containers/common v0.31.1/go.mod h1:Fehe82hQfJQvDspnRrV9rcdAWG3IalNHEt0F6QWNBHQ=
 | 
			
		||||
github.com/containers/common v0.33.0 h1:7Z6aAQ2s2iniEXd/IoGgc0ukmgmzAE8Oa929t6huVB8=
 | 
			
		||||
github.com/containers/common v0.33.0/go.mod h1:mjDo/NKeweL/onaspLhZ38WnHXaYmrELHclIdvSnYpY=
 | 
			
		||||
github.com/containers/common v0.33.1 h1:XpDiq8Cta8+u1s4kpYSEWdB140ZmqgyIXfWkLqKx3z0=
 | 
			
		||||
github.com/containers/common v0.33.1/go.mod h1:mjDo/NKeweL/onaspLhZ38WnHXaYmrELHclIdvSnYpY=
 | 
			
		||||
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.9.0 h1:dRmUtcluQcmasNo3DpnRoZjfU0rOu1qZeL6wlDJr10Q=
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -318,7 +318,7 @@ type EngineConfig struct {
 | 
			
		|||
 | 
			
		||||
	// RuntimeSupportsNoCgroups is a list of OCI runtimes that support
 | 
			
		||||
	// running containers without CGroups.
 | 
			
		||||
	RuntimeSupportsNoCgroups []string `toml:"runtime_supports_nocgroupv2,omitempty"`
 | 
			
		||||
	RuntimeSupportsNoCgroups []string `toml:"runtime_supports_nocgroup,omitempty"`
 | 
			
		||||
 | 
			
		||||
	// RuntimeSupportsKVM is a list of OCI runtimes that support
 | 
			
		||||
	// KVM separation for containers.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -69,7 +69,7 @@ func isRetryable(err error) bool {
 | 
			
		|||
		}
 | 
			
		||||
		return isRetryable(e.Err)
 | 
			
		||||
	case syscall.Errno:
 | 
			
		||||
		return shouldRestart(e)
 | 
			
		||||
		return isErrnoRetryable(e)
 | 
			
		||||
	case errcode.Errors:
 | 
			
		||||
		// if this error is a group of errors, process them all in turn
 | 
			
		||||
		for i := range e {
 | 
			
		||||
| 
						 | 
				
			
			@ -94,10 +94,10 @@ func isRetryable(err error) bool {
 | 
			
		|||
	return false
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func shouldRestart(e error) bool {
 | 
			
		||||
func isErrnoRetryable(e error) bool {
 | 
			
		||||
	switch e {
 | 
			
		||||
	case syscall.ECONNREFUSED, syscall.EINTR, syscall.EAGAIN, syscall.EBUSY, syscall.ENETDOWN, syscall.ENETUNREACH, syscall.ENETRESET, syscall.ECONNABORTED, syscall.ECONNRESET, syscall.ETIMEDOUT, syscall.EHOSTDOWN, syscall.EHOSTUNREACH:
 | 
			
		||||
		return true
 | 
			
		||||
	}
 | 
			
		||||
	return shouldRestartPlatform(e)
 | 
			
		||||
	return isErrnoERESTART(e)
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,6 +4,6 @@ import (
 | 
			
		|||
	"syscall"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
func shouldRestartPlatform(e error) bool {
 | 
			
		||||
func isErrnoERESTART(e error) bool {
 | 
			
		||||
	return e == syscall.ERESTART
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,6 +2,6 @@
 | 
			
		|||
 | 
			
		||||
package retry
 | 
			
		||||
 | 
			
		||||
func shouldRestartPlatform(e error) bool {
 | 
			
		||||
func isErrnoERESTART(e error) bool {
 | 
			
		||||
	return false
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
package version
 | 
			
		||||
 | 
			
		||||
// Version is the version of the build.
 | 
			
		||||
const Version = "0.33.0"
 | 
			
		||||
const Version = "0.33.1"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -89,7 +89,7 @@ github.com/containers/buildah/pkg/parse
 | 
			
		|||
github.com/containers/buildah/pkg/rusage
 | 
			
		||||
github.com/containers/buildah/pkg/supplemented
 | 
			
		||||
github.com/containers/buildah/util
 | 
			
		||||
# github.com/containers/common v0.33.0
 | 
			
		||||
# github.com/containers/common v0.33.1
 | 
			
		||||
github.com/containers/common/pkg/apparmor
 | 
			
		||||
github.com/containers/common/pkg/apparmor/internal/supported
 | 
			
		||||
github.com/containers/common/pkg/auth
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue