diff options
| author | baude <bbaude@redhat.com> | 2018-01-03 14:00:45 -0600 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-01-04 17:39:42 +0000 |
| commit | 04593b1591fe78b5e8689ce144431a3f07c19fbe (patch) | |
| tree | d4ec6559baa4145518a011aaf56e678a82c2ec96 | |
| parent | 26c83de94392aa0c1207bea358e3ea22fc047222 (diff) | |
| download | podman-04593b1591fe78b5e8689ce144431a3f07c19fbe.tar.gz podman-04593b1591fe78b5e8689ce144431a3f07c19fbe.tar.bz2 podman-04593b1591fe78b5e8689ce144431a3f07c19fbe.zip | |
Run by shortname
While pulling by shortname (fedora-minimal) worked, running a container
by the short name did not due to a logic error.
Signed-off-by: baude <bbaude@redhat.com>
Closes: #182
Approved by: rhatdan
| -rw-r--r-- | cmd/podman/create.go | 3 | ||||
| -rw-r--r-- | libpod/runtime_img.go | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go index 182eb1e56..0ddf59ce0 100644 --- a/cmd/podman/create.go +++ b/cmd/podman/create.go @@ -344,7 +344,7 @@ func imageData(c *cli.Context, runtime *libpod.Runtime, image string) (string, s if err != nil { return "", "", nil, err } - storageImage, err := runtime.GetImage(image) + storageImage, err := runtime.GetImage(imageName) if err != nil { return "", "", nil, errors.Wrapf(err, "error getting storage image %q", image) } @@ -452,7 +452,6 @@ func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime) (*createConfig, er } shmDir = ctr.ShmDir() } - imageName, imageID, data, err := imageData(c, runtime, image) if err != nil { return nil, err diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go index 53211ff54..6178d5372 100644 --- a/libpod/runtime_img.go +++ b/libpod/runtime_img.go @@ -328,12 +328,12 @@ func getTags(nameInput string) (reference.NamedTagged, bool, error) { // It will return an empty string and error if not found. func (k *Image) GetLocalImageName() (string, error) { _, err := k.runtime.GetImage(k.Name) - if err != nil { - return "", errors.Wrapf(err, "unable to obtain local image") + if err == nil { + return k.Name, nil } localImages, err := k.runtime.GetImages(&ImageFilterParams{}) if err != nil { - return "", errors.Wrapf(err, "unable to obtain local image") + return "", errors.Wrapf(err, "unable to find local images") } _, isTagged, err := getTags(k.Name) if err != nil { @@ -370,8 +370,7 @@ func (k *Image) GetLocalImageName() (string, error) { } } } - fqname, _ := k.GetFQName() - return fqname, nil + return "", errors.Wrapf(storage.ErrImageUnknown, "unable to find image locally") } // HasLatest determines if we have the latest image local |