summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorumohnani8 <umohnani@redhat.com>2018-02-01 12:22:34 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2018-02-02 16:57:54 +0000
commitd0eb1e0ed65fc9585c1b1a1378d747f79060fcb3 (patch)
tree3731b718af69e7af422ee13f38fd23bdfd591c40 /cmd
parent0387f69d39b7ff15c78ff39ddb350523c73719d6 (diff)
downloadpodman-d0eb1e0ed65fc9585c1b1a1378d747f79060fcb3.tar.gz
podman-d0eb1e0ed65fc9585c1b1a1378d747f79060fcb3.tar.bz2
podman-d0eb1e0ed65fc9585c1b1a1378d747f79060fcb3.zip
Fix --cert-dir path for podman login
podman login would add on the registry name to the cert-dir path making containers/image look in a directory that did not exist for certificates. Signed-off-by: umohnani8 <umohnani@redhat.com> Closes: #283 Approved by: rhatdan
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/login.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/cmd/podman/login.go b/cmd/podman/login.go
index 325bf8621..f57f34532 100644
--- a/cmd/podman/login.go
+++ b/cmd/podman/login.go
@@ -5,7 +5,6 @@ import (
"context"
"fmt"
"os"
- "path/filepath"
"strings"
"github.com/containers/image/docker"
@@ -75,7 +74,7 @@ func loginCmd(c *cli.Context) error {
}
sc.DockerInsecureSkipTLSVerify = !c.BoolT("tls-verify")
if c.String("cert-dir") != "" {
- sc.DockerCertPath = filepath.Join(c.String("cert-dir"), server)
+ sc.DockerCertPath = c.String("cert-dir")
}
if err = docker.CheckAuth(context.TODO(), sc, username, password, server); err == nil {