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

Merge pull request #6173 from containers/dependabot/go_modules/github.com/containers/common-0.11.2

Browse Source 
Bump github.com/containers/common from 0.11.1 to 0.11.2
This commit is contained in:
OpenShift Merge Robot
2020-05-12 05:02:47 -07:00
committed by GitHub
parent 1e85ebd154 c4e391ad2e
commit 968741d6de
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,12 +19,15 @@ import (
)
const (
// _configPath is the path to the containers/containers.conf
// inside a given config directory.
_configPath = "containers/containers.conf"
// DefaultContainersConfig holds the default containers config path
DefaultContainersConfig = "/usr/share/containers/containers.conf"
DefaultContainersConfig = "/usr/share/" + _configPath
// OverrideContainersConfig holds the default config paths overridden by the root user
OverrideContainersConfig = "/etc/containers/containers.conf"
OverrideContainersConfig = "/etc/" + _configPath
// UserOverrideContainersConfig holds the containers config path overridden by the rootless user
UserOverrideContainersConfig = ".config/containers/containers.conf"
UserOverrideContainersConfig = ".config/" + _configPath
)
// RuntimeStateStore is a constant indicating which state store implementation
@ -827,7 +830,7 @@ func isDirectory(path string) error {
func rootlessConfigPath() (string, error) {
if configHome := os.Getenv("XDG_CONFIG_HOME"); configHome != "" {
return filepath.Join(configHome, UserOverrideContainersConfig), nil
return filepath.Join(configHome, _configPath), nil
}
home, err := unshare.HomeDir()
if err != nil {