opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-09 15:19:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5925 from rhatdan/containers.conf

Browse Source 
Bump to github.com/containers/common to v0.9.2
This commit is contained in:
OpenShift Merge Robot
2020-04-21 16:15:26 -04:00
committed by GitHub
parent ba1b5d4559 08734894ae
commit ce07f1cde8
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vendor/github.com/containers/common/pkg/config/libpodConfig.go generated vendored
View File

@@ -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

2
vendor/modules.txt vendored
View File

@@ -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