From 08734894ae4acd3e851edc1fdb804d973f17455f Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Tue, 21 Apr 2020 13:30:17 -0400
Subject: 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>
---
vendor/github.com/containers/common/pkg/config/libpodConfig.go | 6 ++++++
vendor/modules.txt | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
(limited to 'vendor')
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 3b45161da..e41318adb 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/capabilities
github.com/containers/common/pkg/cgroupv2
--
cgit v1.2.3-54-g00ecf