diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2021-02-09 17:59:37 +0100 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2021-02-09 19:05:15 +0100 |
| commit | 68414537c1575f75147bcab1bda35593acea9ac3 (patch) | |
| tree | dddbbbd000115b5bfd4dda81a031b1a2205beb71 /vendor | |
| parent | 763d522983b819ecd38689c9c0840069d1e2b530 (diff) | |
| download | podman-68414537c1575f75147bcab1bda35593acea9ac3.tar.gz podman-68414537c1575f75147bcab1bda35593acea9ac3.tar.bz2 podman-68414537c1575f75147bcab1bda35593acea9ac3.zip | |
vendor github.com/containers/image v5.10.2
Fixes: #8559
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/containers/image/v5/pkg/sysregistriesv2/shortnames.go | 21 | ||||
| -rw-r--r-- | vendor/github.com/containers/image/v5/version/version.go | 2 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
3 files changed, 19 insertions, 6 deletions
diff --git a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/shortnames.go b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/shortnames.go index 4001b65b6..a9c498d7a 100644 --- a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/shortnames.go +++ b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/shortnames.go @@ -7,6 +7,7 @@ import ( "github.com/BurntSushi/toml" "github.com/containers/image/v5/docker/reference" + "github.com/containers/image/v5/internal/rootless" "github.com/containers/image/v5/types" "github.com/containers/storage/pkg/homedir" "github.com/containers/storage/pkg/lockfile" @@ -27,12 +28,24 @@ func shortNameAliasesConfPath(ctx *types.SystemContext) (string, error) { return ctx.UserShortNameAliasConfPath, nil } - configHome, err := homedir.GetConfigHome() - if err != nil { - return "", err + if rootless.GetRootlessEUID() == 0 { + // Root user or in a non-conforming user NS + return filepath.Join("/var/cache", userShortNamesFile), nil + } + + // Rootless user + var cacheRoot string + if xdgCache := os.Getenv("XDG_CACHE_HOME"); xdgCache != "" { + cacheRoot = xdgCache + } else { + configHome, err := homedir.GetConfigHome() + if err != nil { + return "", err + } + cacheRoot = filepath.Join(configHome, ".cache") } - return filepath.Join(configHome, userShortNamesFile), nil + return filepath.Join(cacheRoot, userShortNamesFile), nil } // shortNameAliasConf is a subset of the `V2RegistriesConf` format. It's used in the diff --git a/vendor/github.com/containers/image/v5/version/version.go b/vendor/github.com/containers/image/v5/version/version.go index 1fc775410..4c722505c 100644 --- a/vendor/github.com/containers/image/v5/version/version.go +++ b/vendor/github.com/containers/image/v5/version/version.go @@ -8,7 +8,7 @@ const ( // VersionMinor is for functionality in a backwards-compatible manner VersionMinor = 10 // VersionPatch is for backwards-compatible bug fixes - VersionPatch = 1 + VersionPatch = 2 // VersionDev indicates development branch. Releases will be empty string. VersionDev = "" diff --git a/vendor/modules.txt b/vendor/modules.txt index 9d950f0dd..7c1eaf8df 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -110,7 +110,7 @@ github.com/containers/common/pkg/umask github.com/containers/common/version # github.com/containers/conmon v2.0.20+incompatible github.com/containers/conmon/runner/config -# github.com/containers/image/v5 v5.10.1 +# github.com/containers/image/v5 v5.10.2 github.com/containers/image/v5/copy github.com/containers/image/v5/directory github.com/containers/image/v5/directory/explicitfilepath |