summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-21 16:15:26 -0400
committerGitHub <noreply@github.com>2020-04-21 16:15:26 -0400
commitce07f1cde8315e367da99c843609ff1a52a27f9d (patch)
tree1d9496633e9dede8e98903d85d091603c29761e1 /vendor
parentba1b5d4559d336b5d52d961eb273f6fe40c50d8f (diff)
parent08734894ae4acd3e851edc1fdb804d973f17455f (diff)
downloadpodman-ce07f1cde8315e367da99c843609ff1a52a27f9d.tar.gz
podman-ce07f1cde8315e367da99c843609ff1a52a27f9d.tar.bz2
podman-ce07f1cde8315e367da99c843609ff1a52a27f9d.zip
Merge pull request #5925 from rhatdan/containers.conf
Bump to github.com/containers/common to v0.9.2
Diffstat (limited to 'vendor')
-rw-r--r--vendor/github.com/containers/common/pkg/config/libpodConfig.go6
-rw-r--r--vendor/modules.txt2
2 files changed, 7 insertions, 1 deletions
diff --git a/vendor/github.com/containers/common/pkg/config/libpodConfig.go b/vendor/github.com/containers/common/pkg/config/libpodConfig.go
index cdb38a514..89566f789 100644
--- a/vendor/github.com/containers/common/pkg/config/libpodConfig.go
+++ b/vendor/github.com/containers/common/pkg/config/libpodConfig.go
@@ -224,6 +224,12 @@ func newLibpodConfig(c *Config) error {
}
}
+ // hard code EventsLogger to "file" to match older podman versions.
+ if config.EventsLogger != "file" {
+ logrus.Debugf("Ignoring lipod.conf EventsLogger setting %q. Use containers.conf if you want to change this setting and remove libpod.conf files.", config.EventsLogger)
+ config.EventsLogger = "file"
+ }
+
c.libpodToContainersConfig(config)
return nil
diff --git a/vendor/modules.txt b/vendor/modules.txt
index fc2179675..428812cc6 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -82,7 +82,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.9.1
+# github.com/containers/common v0.9.2
github.com/containers/common/pkg/apparmor
github.com/containers/common/pkg/auth
github.com/containers/common/pkg/capabilities