container/podman
container/podman
1
0
Fork 0
mirror of https://github.com/containers/podman synced 2024-10-20 01:03:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

rootless: skip check fo /etc/containers/registries.conf

Browse source 
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>
This commit is contained in:
Giuseppe Scrivano 2019-05-29 17:41:37 +02:00
parent c9357f07ce
commit ad806f78e3
No known key found for this signature in database
GPG key ID: E4730F97F60286ED
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmd/podman/platform_linux.go
View file

@ -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")
}
}