Merge pull request #6333 from containers/dependabot/go_modules/github.com/containers/common-0.11.4

Bump github.com/containers/common from 0.11.2 to 0.11.4

5 files changed, 61 insertions, 40 deletions

diff --git a/go.mod b/go.mod
index aadce78c3..1fb60d41d 100644
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/containernetworking/cni v0.7.2-0.20200304161608-4fae32b84921
 	github.com/containernetworking/plugins v0.8.6
 	github.com/containers/buildah v1.14.9-0.20200501175434-42a48f9373d9
-	github.com/containers/common v0.11.2
+	github.com/containers/common v0.11.4
 	github.com/containers/conmon v2.0.16+incompatible
 	github.com/containers/image/v5 v5.4.4
 	github.com/containers/psgo v1.5.0
diff --git a/go.sum b/go.sum
index fc2907d70..ae9ecebce 100644
--- a/go.sum
+++ b/go.sum
@@ -72,8 +72,8 @@ github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHV
 github.com/containers/buildah v1.14.9-0.20200501175434-42a48f9373d9 h1:EGegltin15wEzCI/5jeHcxBKfwwIHYkBUvsYC3XP060=
 github.com/containers/buildah v1.14.9-0.20200501175434-42a48f9373d9/go.mod h1:+2aNsVcd4pVzmVAbOfWN5X+0Lpz2rtICSGXbTSCzdBU=
 github.com/containers/common v0.10.0/go.mod h1:6A/moCuQITXLqBe5A0WKKTcCfCmEQRbknI05HcPzOL0=
-github.com/containers/common v0.11.2 h1:e4477fCE3qSA+Z2vT+uUMUTn8s8CyIM++qNm3PCSl68=
-github.com/containers/common v0.11.2/go.mod h1:2w3QE6VUmhltGYW4wV00h4okq1Crs7hNI1ZD2I0QRUY=
+github.com/containers/common v0.11.4 h1:M7lmjaVY+29g+YiaWH/UP4YeHjT/pZMxvRgmsWsQn74=
+github.com/containers/common v0.11.4/go.mod h1:AOxw4U5TJJrR/J1QPRvWbjHNdwU13wMy79rjK+7+aJE=
 github.com/containers/conmon v2.0.16+incompatible h1:QFOlb9Id4WoJ24BelCFWwDSPTquwKMp3L3g2iGmRTq4=
 github.com/containers/conmon v2.0.16+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
 github.com/containers/image/v5 v5.4.3/go.mod h1:pN0tvp3YbDd7BWavK2aE0mvJUqVd2HmhPjekyWSFm0U=
@@ -337,7 +337,6 @@ github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
-github.com/onsi/gomega v1.10.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
diff --git a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go
index 7debd2984..185ce8cee 100644
--- a/vendor/github.com/containers/common/pkg/config/default.go
+++ b/vendor/github.com/containers/common/pkg/config/default.go
@@ -476,10 +476,11 @@ func (c *Config) Ulimits() []string {
 // PidsLimit returns the default maximum number of pids to use in containers
 func (c *Config) PidsLimit() int64 {
 	if unshare.IsRootless() {
-		cgroup2, _ := cgroupv2.Enabled()
-		if cgroup2 {
-			return c.Containers.PidsLimit
-		} else {
+		if c.Engine.CgroupManager == SystemdCgroupsManager {
+			cgroup2, _ := cgroupv2.Enabled()
+			if cgroup2 {
+				return c.Containers.PidsLimit
+			}
 			return 0
 		}
 	}
diff --git a/vendor/github.com/containers/common/pkg/config/libpodConfig.go b/vendor/github.com/containers/common/pkg/config/libpodConfig.go
index 89566f789..a8e4c9c93 100644
--- a/vendor/github.com/containers/common/pkg/config/libpodConfig.go
+++ b/vendor/github.com/containers/common/pkg/config/libpodConfig.go
@@ -246,20 +246,6 @@ func readLibpodConfigFromFile(path string, config *ConfigFromLibpod) (*ConfigFro
 		return nil, fmt.Errorf("unable to decode configuration %v: %v", path, err)
 	}
 
-	// For the sake of backwards compat we need to check if the config fields
-	// with *Set suffix are set in the config.  Note that the storage-related
-	// fields are NOT set in the config here but in the storage.conf OR directly
-	// by the user.
-	if config.VolumePath != "" {
-		config.VolumePathSet = true
-	}
-	if config.StaticDir != "" {
-		config.StaticDirSet = true
-	}
-	if config.TmpDir != "" {
-		config.TmpDirSet = true
-	}
-
 	return config, err
 }
 
@@ -350,40 +336,75 @@ func (c *Config) libpodConfig() *ConfigFromLibpod {
 
 func (c *Config) libpodToContainersConfig(libpodConf *ConfigFromLibpod) {
 
-	c.Containers.InitPath = libpodConf.InitPath
+	if libpodConf.InitPath != "" {
+		c.Containers.InitPath = libpodConf.InitPath
+	}
 	c.Containers.LogSizeMax = libpodConf.MaxLogSize
 	c.Containers.EnableLabeling = libpodConf.EnableLabeling
 
-	c.Engine.SignaturePolicyPath = libpodConf.SignaturePolicyPath
+	if libpodConf.SignaturePolicyPath != "" {
+		c.Engine.SignaturePolicyPath = libpodConf.SignaturePolicyPath
+	}
 	c.Engine.SetOptions = libpodConf.SetOptions
-	c.Engine.VolumePath = libpodConf.VolumePath
-	c.Engine.ImageDefaultTransport = libpodConf.ImageDefaultTransport
-	c.Engine.OCIRuntime = libpodConf.OCIRuntime
+	if libpodConf.VolumePath != "" {
+		c.Engine.VolumePath = libpodConf.VolumePath
+	}
+	if libpodConf.ImageDefaultTransport != "" {
+		c.Engine.ImageDefaultTransport = libpodConf.ImageDefaultTransport
+	}
+	if libpodConf.OCIRuntime != "" {
+		c.Engine.OCIRuntime = libpodConf.OCIRuntime
+	}
 	c.Engine.OCIRuntimes = libpodConf.OCIRuntimes
 	c.Engine.RuntimeSupportsJSON = libpodConf.RuntimeSupportsJSON
 	c.Engine.RuntimeSupportsNoCgroups = libpodConf.RuntimeSupportsNoCgroups
 	c.Engine.RuntimePath = libpodConf.RuntimePath
 	c.Engine.ConmonPath = libpodConf.ConmonPath
 	c.Engine.ConmonEnvVars = libpodConf.ConmonEnvVars
-	c.Engine.CgroupManager = libpodConf.CgroupManager
-	c.Engine.StaticDir = libpodConf.StaticDir
-	c.Engine.TmpDir = libpodConf.TmpDir
+	if libpodConf.CgroupManager != "" {
+		c.Engine.CgroupManager = libpodConf.CgroupManager
+	}
+	if libpodConf.StaticDir != "" {
+		c.Engine.StaticDir = libpodConf.StaticDir
+	}
+	if libpodConf.TmpDir != "" {
+		c.Engine.TmpDir = libpodConf.TmpDir
+	}
 	c.Engine.NoPivotRoot = libpodConf.NoPivotRoot
 	c.Engine.HooksDir = libpodConf.HooksDir
-	c.Engine.Namespace = libpodConf.Namespace
-	c.Engine.InfraImage = libpodConf.InfraImage
-	c.Engine.InfraCommand = libpodConf.InfraCommand
+	if libpodConf.Namespace != "" {
+		c.Engine.Namespace = libpodConf.Namespace
+	}
+	if libpodConf.InfraImage != "" {
+		c.Engine.InfraImage = libpodConf.InfraImage
+	}
+	if libpodConf.InfraCommand != "" {
+		c.Engine.InfraCommand = libpodConf.InfraCommand
+	}
+
 	c.Engine.EnablePortReservation = libpodConf.EnablePortReservation
-	c.Engine.NetworkCmdPath = libpodConf.NetworkCmdPath
+	if libpodConf.NetworkCmdPath != "" {
+		c.Engine.NetworkCmdPath = libpodConf.NetworkCmdPath
+	}
 	c.Engine.NumLocks = libpodConf.NumLocks
 	c.Engine.LockType = libpodConf.LockType
-	c.Engine.EventsLogger = libpodConf.EventsLogger
-	c.Engine.EventsLogFilePath = libpodConf.EventsLogFilePath
-	c.Engine.DetachKeys = libpodConf.DetachKeys
+	if libpodConf.EventsLogger != "" {
+		c.Engine.EventsLogger = libpodConf.EventsLogger
+	}
+	if libpodConf.EventsLogFilePath != "" {
+		c.Engine.EventsLogFilePath = libpodConf.EventsLogFilePath
+	}
+	if libpodConf.DetachKeys != "" {
+		c.Engine.DetachKeys = libpodConf.DetachKeys
+	}
 	c.Engine.SDNotify = libpodConf.SDNotify
 	c.Engine.CgroupCheck = libpodConf.CgroupCheck
 
-	c.Network.NetworkConfigDir = libpodConf.CNIConfigDir
+	if libpodConf.CNIConfigDir != "" {
+		c.Network.NetworkConfigDir = libpodConf.CNIConfigDir
+	}
 	c.Network.CNIPluginDirs = libpodConf.CNIPluginDir
-	c.Network.DefaultNetwork = libpodConf.CNIDefaultNetwork
+	if libpodConf.CNIDefaultNetwork != "" {
+		c.Network.DefaultNetwork = libpodConf.CNIDefaultNetwork
+	}
 }
diff --git a/vendor/modules.txt b/vendor/modules.txt
index fb05b08d3..62bb5bc98 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.11.2
+# github.com/containers/common v0.11.4
 github.com/containers/common/pkg/apparmor
 github.com/containers/common/pkg/auth
 github.com/containers/common/pkg/capabilities