diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-13 09:34:33 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-13 09:34:33 -0800 |
commit | 140ae25c4d0c7ba89a0bb7ae16f81f90d20be535 (patch) | |
tree | a5e30854d0669694556fdde8de43e00d30176d9c /cmd/podman/main.go | |
parent | 9ada9722ecba373b317e1ab3e9adf716fc777d8d (diff) | |
parent | 43c6da22b976b6050f86dca50564a4c2b08caee0 (diff) | |
download | podman-140ae25c4d0c7ba89a0bb7ae16f81f90d20be535.tar.gz podman-140ae25c4d0c7ba89a0bb7ae16f81f90d20be535.tar.bz2 podman-140ae25c4d0c7ba89a0bb7ae16f81f90d20be535.zip |
Merge pull request #2141 from baude/remotetag
Add darwin support for remote-client
Diffstat (limited to 'cmd/podman/main.go')
-rw-r--r-- | cmd/podman/main.go | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go index 604404827..ce60bbfb7 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -120,7 +120,7 @@ func main() { os.Exit(1) } args := c.Args() - if args.Present() { + if args.Present() && rootless.IsRootless() { if _, notRequireRootless := cmdsNotRequiringRootless[args.First()]; !notRequireRootless { became, ret, err := rootless.BecomeRootInUserNS() if err != nil { @@ -265,11 +265,10 @@ func main() { Usage: "output logging information to syslog as well as the console", }, } - if _, err := os.Stat("/etc/containers/registries.conf"); err != nil { - if os.IsNotExist(err) { - logrus.Warn("unable to find /etc/containers/registries.conf. some podman (image shortnames) commands may be limited") - } - } + // Check if /etc/containers/registries.conf exists when running in + // in a local environment. + CheckForRegistries() + if err := app.Run(os.Args); err != nil { if debug { logrus.Errorf(err.Error()) |