containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify pullGoalFromPossiblyUnqualifiedName 

Both imageParts and this function implicitly assume docker.Transport
troughout, so instead of pretending to be flexible about DefaultTransport,
just hard-code docker.ParseReference directly.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač 2019-01-09 19:12:17 +01:00
parent e9721b757a
commit 788bc36021
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/image/pull.go
View File

@ -290,7 +290,7 @@ func (ir *Runtime) pullGoalFromPossiblyUnqualifiedName(inputName string) (*pullG
} else { } else {
imageName = decomposedImage.assemble() imageName = decomposedImage.assemble()
} }
srcRef, err := alltransports.ParseImageName(fmt.Sprintf("%s%s", DefaultTransport, imageName)) srcRef, err := docker.ParseReference("//" + imageName)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "unable to parse '%s'", inputName) return nil, errors.Wrapf(err, "unable to parse '%s'", inputName)
} }
@ -322,7 +322,7 @@ func (ir *Runtime) pullGoalFromPossiblyUnqualifiedName(inputName string) (*pullG
if hasShaInInputName(inputName) { if hasShaInInputName(inputName) {
imageName = fmt.Sprintf("%s/%s", registry, inputName) imageName = fmt.Sprintf("%s/%s", registry, inputName)
} }
srcRef, err := alltransports.ParseImageName(fmt.Sprintf("%s%s", DefaultTransport, imageName)) srcRef, err := docker.ParseReference("//" + imageName)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "unable to parse '%s'", inputName) return nil, errors.Wrapf(err, "unable to parse '%s'", inputName)
} }