beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #30889 from aaronlehmann/addreference-tag-digest

Browse source 
reference: Handle combination of tag and digest in AddReference
This commit is contained in:
Sebastiaan van Stijn 2017-02-10 13:27:12 -08:00 committed by GitHub
commit 584e399d96
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reference/store.go
View file

@ -107,6 +107,20 @@ func (store *store) AddDigest(ref reference.Canonical, id digest.Digest, force b
}
func (store *store) addReference(ref reference.Named, id digest.Digest, force bool) error {
// If the reference includes a digest and a tag, we must store only the
// digest.
canonical, isCanonical := ref.(reference.Canonical)
_, isNamedTagged := ref.(reference.NamedTagged)
if isCanonical && isNamedTagged {
trimmed, err := reference.WithDigest(reference.TrimNamed(canonical), canonical.Digest())
if err != nil {
// should never happen
return err
}
ref = trimmed
}
refName := reference.FamiliarName(ref)
refStr := reference.FamiliarString(ref)