diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-05-29 17:41:37 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-05-30 09:01:55 +0200 |
| commit | ad806f78e3b8316e081d53c6584f05cd1e01016a (patch) | |
| tree | 1c80de732ce50781408f23541ccf521e9666c3c7 /cmd | |
| parent | c9357f07cea6a62e59714200073541711aa3b55c (diff) | |
| download | podman-ad806f78e3b8316e081d53c6584f05cd1e01016a.tar.gz podman-ad806f78e3b8316e081d53c6584f05cd1e01016a.tar.bz2 podman-ad806f78e3b8316e081d53c6584f05cd1e01016a.zip | |
rootless: skip check fo /etc/containers/registries.conf
the warning can be confusing when used in rootless mode as the
unprivileged user has no way for setting it up.
Closes: https://github.com/containers/libpod/issues/2955
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/platform_linux.go | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/cmd/podman/platform_linux.go b/cmd/podman/platform_linux.go index 2127923ae..eb11867cc 100644 --- a/cmd/podman/platform_linux.go +++ b/cmd/podman/platform_linux.go @@ -4,13 +4,25 @@ package main import ( "os" + "path/filepath" + "github.com/containers/libpod/pkg/rootless" "github.com/sirupsen/logrus" ) +// userRegistriesFile is the path to the per user registry configuration file. +var userRegistriesFile = filepath.Join(os.Getenv("HOME"), ".config/containers/registries.conf") + func CheckForRegistries() { if _, err := os.Stat("/etc/containers/registries.conf"); err != nil { if os.IsNotExist(err) { + // If it is running in rootless mode, also check the user configuration file + if rootless.IsRootless() { + if _, err := os.Stat(userRegistriesFile); err != nil { + logrus.Warnf("unable to find %s. some podman (image shortnames) commands may be limited", userRegistriesFile) + } + return + } logrus.Warn("unable to find /etc/containers/registries.conf. some podman (image shortnames) commands may be limited") } } |