opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-31 07:27:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Run by shortname

Browse Source 
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
This commit is contained in:
baude
2018-01-03 14:00:45 -06:00
committed by Atomic Bot
parent 26c83de943
commit 04593b1591
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/podman/create.go
View File

@ -344,7 +344,7 @@ func imageData(c *cli.Context, runtime *libpod.Runtime, image string) (string, s
if err != nil { if err != nil {
return "", "", nil, err return "", "", nil, err
} }
storageImage, err := runtime.GetImage(image) storageImage, err := runtime.GetImage(imageName)
if err != nil { if err != nil {
return "", "", nil, errors.Wrapf(err, "error getting storage image %q", image) 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() shmDir = ctr.ShmDir()
} }
imageName, imageID, data, err := imageData(c, runtime, image) imageName, imageID, data, err := imageData(c, runtime, image)
if err != nil { if err != nil {
return nil, err return nil, err

9
libpod/runtime_img.go
View File

@ -328,12 +328,12 @@ func getTags(nameInput string) (reference.NamedTagged, bool, error) {
// It will return an empty string and error if not found. // It will return an empty string and error if not found.
func (k *Image) GetLocalImageName() (string, error) { func (k *Image) GetLocalImageName() (string, error) {
_, err := k.runtime.GetImage(k.Name) _, err := k.runtime.GetImage(k.Name)
if err != nil { if err == nil {
return "", errors.Wrapf(err, "unable to obtain local image") return k.Name, nil
} }
localImages, err := k.runtime.GetImages(&ImageFilterParams{}) localImages, err := k.runtime.GetImages(&ImageFilterParams{})
if err != nil { 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) _, isTagged, err := getTags(k.Name)
if err != nil { if err != nil {
@ -370,8 +370,7 @@ func (k *Image) GetLocalImageName() (string, error) {
} }
} }
} }
fqname, _ := k.GetFQName() return "", errors.Wrapf(storage.ErrImageUnknown, "unable to find image locally")
return fqname, nil
} }
// HasLatest determines if we have the latest image local // HasLatest determines if we have the latest image local