diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-12 05:02:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-12 05:02:47 -0700 |
| commit | 968741d6de3d0d5257a4457f4f0ca055a64f1c95 (patch) | |
| tree | dc67cedc99c1525449158f070401736c1d63b7de /vendor | |
| parent | 1e85ebd154f7fba0fb78a447dfbc0a4923cc7439 (diff) | |
| parent | c4e391ad2e087601a184df6d4b3668d8c166f911 (diff) | |
| download | podman-968741d6de3d0d5257a4457f4f0ca055a64f1c95.tar.gz podman-968741d6de3d0d5257a4457f4f0ca055a64f1c95.tar.bz2 podman-968741d6de3d0d5257a4457f4f0ca055a64f1c95.zip | |
Merge pull request #6173 from containers/dependabot/go_modules/github.com/containers/common-0.11.2
Bump github.com/containers/common from 0.11.1 to 0.11.2
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/containers/common/pkg/config/config.go | 11 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go index 611284476..ef75d9847 100644 --- a/vendor/github.com/containers/common/pkg/config/config.go +++ b/vendor/github.com/containers/common/pkg/config/config.go @@ -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 { diff --git a/vendor/modules.txt b/vendor/modules.txt index 2b0e100b3..f1c5085bf 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.11.1 +# github.com/containers/common v0.11.2 github.com/containers/common/pkg/apparmor github.com/containers/common/pkg/auth github.com/containers/common/pkg/capabilities |