diff options
| author | dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> | 2020-05-11 13:40:26 +0000 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-05-11 14:18:28 -0400 |
| commit | c4e391ad2e087601a184df6d4b3668d8c166f911 (patch) | |
| tree | 115239f97e3cdb925d9eeae1caa50eea42bf9c64 /vendor | |
| parent | d8c6cc16843efac13b92758b1bf93e9d5897a212 (diff) | |
| download | podman-c4e391ad2e087601a184df6d4b3668d8c166f911.tar.gz podman-c4e391ad2e087601a184df6d4b3668d8c166f911.tar.bz2 podman-c4e391ad2e087601a184df6d4b3668d8c166f911.zip | |
Bump github.com/containers/common from 0.11.1 to 0.11.2
Bumps [github.com/containers/common](https://github.com/containers/common) from 0.11.1 to 0.11.2.
- [Release notes](https://github.com/containers/common/releases)
- [Commits](https://github.com/containers/common/compare/v0.11.1...v0.11.2)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
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 fac8238c6..aa14e7d25 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 |