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

update c/{buildah,common,image,storage} to latest main

Browse Source 
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2024-05-08 13:51:48 +02:00
parent ee8ed8dd1f
commit d4c7ca39fd
318 changed files with 25238 additions and 21994 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vendor/github.com/containers/common/pkg/config/new.go generated vendored
View File

@@ -158,16 +158,22 @@ func systemConfigs() (configs []string, finalErr error) {
}
return append(configs, path), nil
}
configs = append(configs, DefaultContainersConfig)
configs = append(configs, OverrideContainersConfig)
var err error
configs, err = addConfigs(OverrideContainersConfig+".d", configs)
path, err := overrideContainersConfigPath()
if err != nil {
return nil, err
}
configs = append(configs, path)
configs, err = addConfigs(path+".d", configs)
if err != nil {
return nil, err
}
path, err := userConfigPath()
path, err = userConfigPath()
if err != nil {
return nil, err
}