summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2018-05-03 14:37:49 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2018-05-04 14:13:18 +0000
commitb44d4fb1ec05aec958a63bdfa3d344cdf4b4da8f (patch)
tree5c43b42c9c0159ab48f9310ca289e0a5c20f5768
parentc34e4541774e2b7ff08017e123c0ef0836a66be4 (diff)
downloadpodman-b44d4fb1ec05aec958a63bdfa3d344cdf4b4da8f.tar.gz
podman-b44d4fb1ec05aec958a63bdfa3d344cdf4b4da8f.tar.bz2
podman-b44d4fb1ec05aec958a63bdfa3d344cdf4b4da8f.zip
Fix pulling from secure registry
when pulling from a secure registry that is documented in registries.conf, we should be able to pull without tls-verify=false Signed-off-by: baude <bbaude@redhat.com> Closes: #718 Approved by: rhatdan
-rw-r--r--libpod/image/pull.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/image/pull.go b/libpod/image/pull.go
index cdecd4e0e..2746d1bc5 100644
--- a/libpod/image/pull.go
+++ b/libpod/image/pull.go
@@ -186,7 +186,7 @@ func (i *Image) pullImage(ctx context.Context, writer io.Writer, authfile, signa
for _, imageInfo := range pullStructs {
copyOptions := getCopyOptions(writer, signaturePolicyPath, dockerOptions, nil, signingOptions, authfile, "", false)
- if imageInfo.srcRef.Transport().Name() == DockerTransport {
+ if strings.HasPrefix(DockerTransport, imageInfo.srcRef.Transport().Name()) {
imgRef, err := reference.Parse(imageInfo.srcRef.DockerReference().String())
if err != nil {
return "", err