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

Bump github.com/containers/common from 0.5.0 to 0.6.1

Browse Source 
Bumps [github.com/containers/common](https://github.com/containers/common) from 0.5.0 to 0.6.1.
- [Release notes](https://github.com/containers/common/releases)
- [Commits](https://github.com/containers/common/compare/v0.5.0...v0.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
dependabot-preview[bot]
2020-03-19 09:16:22 +00:00
committed by Valentin Rothberg
parent bd9386ddac
commit 68a5a85cc2
7 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -302,10 +302,9 @@ func rootlessLibpodConfigPath() (string, error) {
func (c *Config) libpodConfig() *ConfigFromLibpod {
return &ConfigFromLibpod{
SignaturePolicyPath: c.Containers.SignaturePolicyPath,
InitPath: c.Containers.InitPath,
MaxLogSize: c.Containers.LogSizeMax,
EnableLabeling: c.Containers.EnableLabeling,
InitPath: c.Containers.InitPath,
MaxLogSize: c.Containers.LogSizeMax,
EnableLabeling: c.Containers.EnableLabeling,
SetOptions: c.Engine.SetOptions,
VolumePath: c.Engine.VolumePath,
@@ -334,6 +333,7 @@ func (c *Config) libpodConfig() *ConfigFromLibpod {
DetachKeys: c.Engine.DetachKeys,
SDNotify: c.Engine.SDNotify,
CgroupCheck: c.Engine.CgroupCheck,
SignaturePolicyPath: c.Engine.SignaturePolicyPath,
CNIConfigDir: c.Network.NetworkConfigDir,
CNIPluginDir: c.Network.CNIPluginDirs,
@@ -343,11 +343,11 @@ func (c *Config) libpodConfig() *ConfigFromLibpod {
func (c *Config) libpodToContainersConfig(libpodConf *ConfigFromLibpod) {
c.Containers.SignaturePolicyPath = libpodConf.SignaturePolicyPath
c.Containers.InitPath = libpodConf.InitPath
c.Containers.LogSizeMax = libpodConf.MaxLogSize
c.Containers.EnableLabeling = libpodConf.EnableLabeling
c.Engine.SignaturePolicyPath = libpodConf.SignaturePolicyPath
c.Engine.SetOptions = libpodConf.SetOptions
c.Engine.VolumePath = libpodConf.VolumePath
c.Engine.ImageDefaultTransport = libpodConf.ImageDefaultTransport