From e38272047fbafb9fb35419e356d4576824585c23 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 5 Jul 2018 11:37:15 +0200 Subject: rootless: always set XDG_RUNTIME_DIR containers/image uses XDG_RUNTIME_DIR to locate the auth file. Signed-off-by: Giuseppe Scrivano Closes: #1048 Approved by: mheon --- libpod/runtime.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libpod/runtime.go b/libpod/runtime.go index 1078c733e..6f751f959 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -217,6 +217,14 @@ func NewRuntime(options ...RuntimeOption) (runtime *Runtime, err error) { if _, err := os.Stat(configPath); err != nil { foundConfig = false } + + // containers/image uses XDG_RUNTIME_DIR to locate the auth file. + // So make sure the env variable is set. + err = os.Setenv("XDG_RUNTIME_DIR", GetRootlessRuntimeDir()) + if err != nil { + return nil, errors.Wrapf(err, "cannot set XDG_RUNTIME_DIR") + } + } else if _, err := os.Stat(OverrideConfigPath); err == nil { // Use the override configuration path configPath = OverrideConfigPath -- cgit v1.2.3-54-g00ecf