summaryrefslogtreecommitdiff
path: root/vendor/github.com
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-04-21 13:30:17 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2020-04-21 13:31:07 -0400
commit08734894ae4acd3e851edc1fdb804d973f17455f (patch)
tree1f761ec88478f221de047f3d591db8d356735700 /vendor/github.com
parent0d817f5210defac51cc86c60ec86bcefca0511c9 (diff)
downloadpodman-08734894ae4acd3e851edc1fdb804d973f17455f.tar.gz
podman-08734894ae4acd3e851edc1fdb804d973f17455f.tar.bz2
podman-08734894ae4acd3e851edc1fdb804d973f17455f.zip
Bump to github.com/containers/common to v0.9.2
This allows us to fix issues with people with old libpod.conf Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/github.com')
-rw-r--r--vendor/github.com/containers/common/pkg/config/libpodConfig.go6
1 files changed, 6 insertions, 0 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