update c/common

Update containers common to the latest HEAD.  Some bug fixes in libimage
forced us to have a clearer separation between ordinary images and
manifest lists.  Hence, when looking up manifest lists without recursing
into any of their instances, we need to use `LookupManifestList()`.

Also account for some other changes in c/common (e.g., the changed order
in the security labels).

Further vendor the latest HEAD from Buildah which is required to get the
bud tests to pass.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

vendor/github.com/containers/common/pkg/config/config.go

@@ -526,11 +526,11 @@ func systemConfigs() ([]string, error) {
 	if _, err := os.Stat(OverrideContainersConfig); err == nil {
 		configs = append(configs, OverrideContainersConfig)
 	}
-	if unshare.IsRootless() {
-		path, err := rootlessConfigPath()
-		if err != nil {
-			return nil, err
-		}
+	path, err := ifRootlessConfigPath()
+	if err != nil {
+		return nil, err
+	}
+	if path != "" {
 		if _, err := os.Stat(path); err == nil {
 			configs = append(configs, path)
 		}

vendor/github.com/containers/common/pkg/config/config_darwin.go

@@ -4,9 +4,14 @@ import (
 	"os"
 )
 
+// podman remote clients on darwin cannot use unshare.isRootless() to determine the configuration file locations.
 func customConfigFile() (string, error) {
 	if path, found := os.LookupEnv("CONTAINERS_CONF"); found {
 		return path, nil
 	}
 	return rootlessConfigPath()
 }
+
+func ifRootlessConfigPath() (string, error) {
+	return rootlessConfigPath()
+}

vendor/github.com/containers/common/pkg/config/config_linux.go

@@ -24,3 +24,14 @@ func customConfigFile() (string, error) {
 	}
 	return OverrideContainersConfig, nil
 }
+
+func ifRootlessConfigPath() (string, error) {
+	if unshare.IsRootless() {
+		path, err := rootlessConfigPath()
+		if err != nil {
+			return "", err
+		}
+		return path, nil
+	}
+	return "", nil
+}

vendor/github.com/containers/common/pkg/config/config_windows.go

@@ -2,9 +2,14 @@ package config
 
 import "os"
 
+// podman remote clients on windows cannot use unshare.isRootless() to determine the configuration file locations.
 func customConfigFile() (string, error) {
 	if path, found := os.LookupEnv("CONTAINERS_CONF"); found {
 		return path, nil
 	}
 	return os.Getenv("APPDATA") + "\\containers\\containers.conf", nil
 }
+
+func ifRootlessConfigPath() (string, error) {
+	return os.Getenv("APPDATA") + "\\containers\\containers.conf", nil
+}

vendor/github.com/containers/common/pkg/config/containers.conf

@@ -157,7 +157,7 @@ default_sysctls = [
 
 # Logging driver for the container. Available options: k8s-file and journald.
 #
-# log_driver = "journald"
+# log_driver = "k8s-file"
 
 # Maximum size allowed for the container log file. Negative numbers indicate
 # that no size limit is imposed. If positive, it must be >= 8192 to match or

vendor/github.com/containers/common/pkg/config/default.go

@@ -102,7 +102,7 @@ const (
 	// SystemdCgroupsManager represents systemd native cgroup manager
 	SystemdCgroupsManager = "systemd"
 	// DefaultLogDriver is the default type of log files
-	DefaultLogDriver = "journald"
+	DefaultLogDriver = "k8s-file"
 	// DefaultLogSizeMax is the default value for the maximum log size
 	// allowed for a container. Negative values mean that no limit is imposed.
 	DefaultLogSizeMax = -1