summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2018-07-28 07:47:31 +0200
committerAtomic Bot <atomic-devel@projectatomic.io>2018-08-01 18:22:59 +0000
commit85cb582f8675fb1aca2c156b1dbc41e8b12d58cf (patch)
tree7f9b6d4e1b2347c3b5f965534dbde0af5b83a62f /cmd
parent558a1bd7760c1505a8788a467d9315f94f2ad097 (diff)
downloadpodman-85cb582f8675fb1aca2c156b1dbc41e8b12d58cf.tar.gz
podman-85cb582f8675fb1aca2c156b1dbc41e8b12d58cf.tar.bz2
podman-85cb582f8675fb1aca2c156b1dbc41e8b12d58cf.zip
Fix the heuristic for docker-archive: sources in (podman pull)
Instead of searching for "docker-archive" anywhere in the input, only accept it at the start, and require the colon separator as well. Signed-off-by: Miloslav Trmač <mitr@redhat.com> Closes: #1176 Approved by: rhatdan
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/pull.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/pull.go b/cmd/podman/pull.go
index 431c1e0ed..d8fcf05c2 100644
--- a/cmd/podman/pull.go
+++ b/cmd/podman/pull.go
@@ -111,7 +111,7 @@ func pullCmd(c *cli.Context) error {
}
// Possible for docker-archive to have multiple tags, so use NewFromLoad instead
- if strings.Contains(image, libpod.DockerArchive) {
+ if strings.HasPrefix(image, libpod.DockerArchive+":") {
newImage, err := runtime.ImageRuntime().LoadFromArchive(getContext(), image, c.String("signature-policy"), writer)
if err != nil {
return errors.Wrapf(err, "error pulling image from %q", image)