opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-28 14:29:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Split createNamesToPull into ref{Names,Pairs}FromPossiblyUnqualifiedName

Browse Source 
One part creates []*pullRefName; the other just trivially converts it
into []*pullRefPair.

Also use much more explicit names to explain the functionality.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

Closes: #1112
Approved by: rhatdan
This commit is contained in:
Miloslav Trmač
2018-07-19 00:07:15 +02:00
committed by Atomic Bot
parent b500f9275e
commit 347ba2cc25
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libpod/image/pull.go
View File

@ -195,7 +195,7 @@ func (i *Image) pullImage(ctx context.Context, writer io.Writer, authfile, signa
srcRef, err := alltransports.ParseImageName(i.InputName) srcRef, err := alltransports.ParseImageName(i.InputName)
if err != nil { if err != nil {
// could be trying to pull from registry with short name // could be trying to pull from registry with short name
pullRefPairs, err = i.createNamesToPull() pullRefPairs, err = i.refPairsFromPossiblyUnqualifiedName()
if err != nil { if err != nil {
return nil, errors.Wrap(err, "error getting default registries to try") return nil, errors.Wrap(err, "error getting default registries to try")
} }
@ -264,9 +264,9 @@ func (i *Image) pullImage(ctx context.Context, writer io.Writer, authfile, signa
return images, nil return images, nil
} }
// createNamesToPull looks at a decomposed image and determines the possible // refNamesFromPossiblyUnqualifiedName looks at a decomposed image and determines the possible
// images names to try pulling in combination with the registries.conf file as well // image names to try pulling in combination with the registries.conf file as well
func (i *Image) createNamesToPull() ([]*pullRefPair, error) { func (i *Image) refNamesFromPossiblyUnqualifiedName() ([]*pullRefName, error) {
var ( var (
pullNames []*pullRefName pullNames []*pullRefName
imageName string imageName string
@ -320,7 +320,17 @@ func (i *Image) createNamesToPull() ([]*pullRefPair, error) {
pullNames = append(pullNames, &ps) pullNames = append(pullNames, &ps)
} }
} }
return i.imageruntime.pullRefPairsFromRefNames(pullNames) return pullNames, nil
}
// refPairsFromPossiblyUnqualifiedName looks at a decomposed image and determines the possible
// image references to try pulling in combination with the registries.conf file as well
func (i *Image) refPairsFromPossiblyUnqualifiedName() ([]*pullRefPair, error) {
refNames, err := i.refNamesFromPossiblyUnqualifiedName()
if err != nil {
return nil, err
}
return i.imageruntime.pullRefPairsFromRefNames(refNames)
} }
// pullRefPairsFromNames converts a []*pullRefName to []*pullRefPair // pullRefPairsFromNames converts a []*pullRefName to []*pullRefPair